diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-14 15:23:18 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-14 15:23:18 -0700 |
commit | 07198afbd19f5ba4f991d9b554bc320690de19dc (patch) | |
tree | af4a70e09a97335a1b5db7ce0f61f179c47f905b /remote.h | |
parent | c809496c97122b7d297e7216c3bfff7262b212e0 (diff) | |
parent | d56583ded679f2eade3994d855c8d605e2964710 (diff) | |
download | git-07198afbd19f5ba4f991d9b554bc320690de19dc.tar.gz |
Merge branch 'mm/fetch-show-error-message-on-unadvertised-object'
"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 'remote.h')
-rw-r--r-- | remote.h | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -89,8 +89,13 @@ struct ref { force:1, forced_update:1, expect_old_sha1:1, - deletion:1, - matched:1; + deletion:1; + + enum { + REF_NOT_MATCHED = 0, /* initial value */ + REF_MATCHED, + REF_UNADVERTISED_NOT_ALLOWED + } match_status; /* * Order is important here, as we write to FETCH_HEAD |