diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2012-09-09 08:19:47 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 11:46:32 -0700 |
| commit | 778e7543d20531bec93d5c9965f32541e78b8e34 (patch) | |
| tree | b1d9b6b9ea90fb80ddb6746426a62406284ecdc0 | |
| parent | 7418f1a0371fd935de6cbe718bbdd567070e9d17 (diff) | |
| download | git-778e7543d20531bec93d5c9965f32541e78b8e34.tar.gz | |
fetch-pack: report missing refs even if no existing refs were received
This fixes a test in t5500.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/fetch-pack.c | 2 | ||||
| -rwxr-xr-x | 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 fb2a423b51..3d388b53e3 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 acd41e8576..894d945bdd 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 |