Re: [PATCH 3/4] mark_reachable_objects(): optionally collect broken refs

2015-09-24 Thread Jeff King
On Thu, Sep 24, 2015 at 11:13:52AM +0200, Johannes Schindelin wrote: > The behavior of `mark_reachable_objects()` without this patch is that it > dies if it encounters a broken ref. This is sometimes undesirable, e.g. > when garbage collecting in a repository with a stale remote HEAD. > > So let'

[PATCH v2 1/1] Makefile: link libcurl before openssl and crypto

2015-09-24 Thread Remi Pommarel
For static linking especially library order while linking is important. For example libssl contains symbol from libcrypto so the former should be linked before the latter. The global link order should be libcurl then libssl then libcrypto then libintl and finally zlib. Signed-off-by: Remi Pommare

Re: [PATCH 2/4] pack-objects: do not get distracted by stale refs

2015-09-24 Thread Jeff King
On Thu, Sep 24, 2015 at 11:13:44AM +0200, Johannes Schindelin wrote: > It is quite possible for, say, a remote HEAD to become stale, e.g. when > the default branch was renamed. > > We should still be able to pack our objects when such a thing happens; > simply ignore invalid refs (because they ca

Re: [PATCH] branch: handle errors on setting tracking branches

2015-09-24 Thread Jeff King
On Thu, Sep 24, 2015 at 12:32:01PM +0200, Patrick Steinhardt wrote: > The function `install_branch_config`, which is used to set up > tracking branches, does not verify return codes of > `git_config_set`. Due to this we may incorrectly print that a > tracking branch has been set up when in fact we

[PATCH] connect: Fix typo in result string of prot_name()

2015-09-24 Thread Tobias Klauser
Replace 'unkown' with 'unknown'. Signed-off-by: Tobias Klauser --- connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect.c b/connect.c index c0144d8..777f31c 100644 --- a/connect.c +++ b/connect.c @@ -254,7 +254,7 @@ static const char *prot_name(enum protocol prot

[PATCH] branch: handle errors on setting tracking branches

2015-09-24 Thread Patrick Steinhardt
The function `install_branch_config`, which is used to set up tracking branches, does not verify return codes of `git_config_set`. Due to this we may incorrectly print that a tracking branch has been set up when in fact we did not due to an error. Fix this by checking the return value of `git_conf

Re: What's cooking in git.git (Sep 2015, #06; Wed, 23)

2015-09-24 Thread Johannes Schindelin
Hi Junio, On 2015-09-24 00:56, Junio C Hamano wrote: > * jc/fsck-dropped-errors (2015-09-23) 1 commit > - fsck: exit with non-zero when problems are found > > There were some classes of errors that "git fsck" diagnosed to its > standard error that did not cause it to exit with non-zero statu

[PATCH 4/4] gc: remove broken refs

2015-09-24 Thread Johannes Schindelin
When encountering broken refs, such as a stale remote HEAD (which can happen if the active branch was renamed in the remote), it is more helpful to remove those refs than to exit with an error. This fixes https://github.com/git-for-windows/git/issues/423 Signed-off-by: Johannes Schindelin --- b

[PATCH 3/4] mark_reachable_objects(): optionally collect broken refs

2015-09-24 Thread Johannes Schindelin
The behavior of `mark_reachable_objects()` without this patch is that it dies if it encounters a broken ref. This is sometimes undesirable, e.g. when garbage collecting in a repository with a stale remote HEAD. So let's introduce an optional parameter to collect such broken refs. The behavior of t

[PATCH 2/4] pack-objects: do not get distracted by stale refs

2015-09-24 Thread Johannes Schindelin
It is quite possible for, say, a remote HEAD to become stale, e.g. when the default branch was renamed. We should still be able to pack our objects when such a thing happens; simply ignore invalid refs (because they cannot matter for the packing process anyway). Signed-off-by: Johannes Schindelin

[PATCH 1/4] gc: demonstrate failure with stale remote HEAD

2015-09-24 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin --- t/t6500-gc.sh | 15 +++ 1 file changed, 15 insertions(+) diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index 63194d8..b736774 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -30,4 +30,19 @@ test_expect_success 'gc -h with invalid configuration' '

[PATCH 0/4] Fix gc failure when a remote HEAD goes stale

2015-09-24 Thread Johannes Schindelin
There has been a report in the Git for Windows project that gc fails sometimes: https://github.com/git-for-windows/git/issues/423 It turns out that there are cases when a remote HEAD can go stale and it is not the user's fault at all. It can happen, for example, if the active branch in the remote

Re: git-p4: t9819 failing

2015-09-24 Thread Luke Diamand
On 23 September 2015 at 13:28, Lars Schneider wrote: > >> Here's the last bit of the crash dump from git-p4 I get: >> >> File "/home/ldiamand/git/git/git-p4", line 2580, in streamP4FilesCbSelf >>self.streamP4FilesCb(entry) >> File "/home/ldiamand/git/git/git-p4", line 2497, in streamP4FilesC

<    1   2