diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 23:52:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 23:52:22 +0300 |
commit | 2b69d3116ffb4a800c408b8cb0b508ca1886ea84 (patch) | |
tree | 9da24f1cd0d0a7bfc7b79a086c67f55c1249b513 /remote.h | |
parent | 41534b626ebdf3fb4fb692749245b90ff2bb7e13 (diff) | |
parent | d56583ded679f2eade3994d855c8d605e2964710 (diff) |
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 '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 |