summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2012-09-09 06:19:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-12 18:46:32 (GMT)
commit778e7543d20531bec93d5c9965f32541e78b8e34 (patch)
treeb1d9b6b9ea90fb80ddb6746426a62406284ecdc0
parent7418f1a0371fd935de6cbe718bbdd567070e9d17 (diff)
downloadgit-778e7543d20531bec93d5c9965f32541e78b8e34.zip
git-778e7543d20531bec93d5c9965f32541e78b8e34.tar.gz
git-778e7543d20531bec93d5c9965f32541e78b8e34.tar.bz2
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.c2
-rwxr-xr-xt/t5500-fetch-pack.sh2
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