From: Michael Haggerty Date: Sun, 9 Sep 2012 06:19:47 +0000 (+0200) Subject: fetch-pack: report missing refs even if no existing refs were received X-Git-Tag: v1.8.0-rc0~30^2~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=778e7543d20531bec93d5c9965f32541e78b8e34;p=git.git fetch-pack: report missing refs even if no existing refs were received This fixes a test in t5500. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index fb2a423b5..3d388b53e 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -1021,7 +1021,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) return 1; ret = !ref; - if (ref && sought.nr) { + if (sought.nr) { /* If the heads to pull were given, we should have * consumed all of them by matching the remote. * Otherwise, 'git fetch remote no-such-ref' would diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index acd41e857..894d945bd 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -403,7 +403,7 @@ test_expect_success 'set up tests of missing reference' ' EOF ' -test_expect_failure 'test lonely missing ref' ' +test_expect_success 'test lonely missing ref' ' ( cd client && test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy