From: mhagger@alum.mit.edu
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Philip Oakley <philipoakley@iee.org>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 14/17] Report missing refs even if no existing refs were received
Date: Sat, 25 Aug 2012 08:44:24 +0200 [thread overview]
Message-ID: <1345877067-11841-15-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1345877067-11841-1-git-send-email-mhagger@alum.mit.edu>
From: Michael Haggerty <mhagger@alum.mit.edu>
This fixes a test in t5500.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
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 f04fd59..00ac3b1 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -1028,7 +1028,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
return 1;
ret = !ref;
- if (ref && nr_heads) {
+ if (nr_heads) {
/* 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 0d4edcb..f78a118 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
next prev parent reply other threads:[~2012-08-25 6:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-25 6:44 [PATCH v2 00/17] Clean up how fetch_pack() handles the heads list mhagger
2012-08-25 6:44 ` [PATCH v2 01/17] t5500: add tests of error output for missing refs mhagger
2012-08-25 6:44 ` [PATCH v2 02/17] Rename static function fetch_pack() to http_fetch_pack() mhagger
2012-08-25 6:44 ` [PATCH v2 03/17] Fix formatting mhagger
2012-08-25 6:44 ` [PATCH v2 04/17] Name local variables more consistently mhagger
2012-08-25 6:44 ` [PATCH v2 05/17] Do not check the same head_pos twice mhagger
2012-08-25 6:44 ` [PATCH v2 06/17] Let fetch_pack() inform caller about number of unique heads mhagger
2012-08-25 6:44 ` [PATCH v2 07/17] Pass nr_heads to do_pack_ref() by reference mhagger
2012-08-25 6:44 ` [PATCH v2 08/17] Pass nr_heads to everything_local() " mhagger
2012-08-25 6:44 ` [PATCH v2 09/17] Pass nr_heads to filter_refs() " mhagger
2012-08-25 6:44 ` [PATCH v2 10/17] Remove ineffective optimization mhagger
2012-08-25 6:44 ` [PATCH v2 11/17] filter_refs(): do not leave gaps in return_refs mhagger
2012-08-25 6:44 ` [PATCH v2 12/17] filter_refs(): compress unmatched refs in heads array mhagger
2012-08-25 6:44 ` [PATCH v2 13/17] cmd_fetch_pack: return early if finish_connect() returns an error mhagger
2012-08-25 6:44 ` mhagger [this message]
2012-08-25 6:44 ` [PATCH v2 15/17] cmd_fetch_pack(): simplify computation of return value mhagger
2012-08-25 6:44 ` [PATCH v2 16/17] fetch_pack(): free matching heads mhagger
2012-08-25 6:44 ` [PATCH v2 17/17] filter_refs(): simplify logic mhagger
2012-08-26 17:20 ` [PATCH v2 00/17] Clean up how fetch_pack() handles the heads list Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345877067-11841-15-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).