summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-28 20:52:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-28 20:52:22 (GMT)
commit2b69d3116ffb4a800c408b8cb0b508ca1886ea84 (patch)
tree9da24f1cd0d0a7bfc7b79a086c67f55c1249b513 /builtin
parent41534b626ebdf3fb4fb692749245b90ff2bb7e13 (diff)
parentd56583ded679f2eade3994d855c8d605e2964710 (diff)
downloadgit-2b69d3116ffb4a800c408b8cb0b508ca1886ea84.zip
git-2b69d3116ffb4a800c408b8cb0b508ca1886ea84.tar.gz
git-2b69d3116ffb4a800c408b8cb0b508ca1886ea84.tar.bz2
Merge branch 'mm/fetch-show-error-message-on-unadvertised-object' into maint
"git fetch" that requests a commit by object name, when the other side does not allow such an request, failed without much explanation. * mm/fetch-show-error-message-on-unadvertised-object: fetch-pack: add specific error for fetching an unadvertised object fetch_refs_via_pack: call report_unmatched_refs fetch-pack: move code to report unmatched refs to a function
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fetch-pack.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index cfe9e44..2a1c1c2 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -219,12 +219,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
* remote no-such-ref' would silently succeed without issuing
* an error.
*/
- for (i = 0; i < nr_sought; i++) {
- if (!sought[i] || sought[i]->matched)
- continue;
- error("no such remote ref %s", sought[i]->name);
- ret = 1;
- }
+ ret |= report_unmatched_refs(sought, nr_sought);
while (ref) {
printf("%s %s\n",