From: Michael Haggerty Date: Sun, 09 Sep 2012 06:19:47 GMT Subject: [PATCH v3 12/14] fetch-pack: report missing refs even if no existing refs were received Message-ID: <1347171589-13327-13-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1347171589-13327-1-git-send-email-mhagger@alum.mit.edu> This fixes a test in t5500. Signed-off-by: Michael Haggerty --- builtin/fetch-pack.c | 2 +- t/t5500-fetch-pack.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index fb2a423..3d388b5 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 acd41e8..894d945 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 -- 1.7.11.3