mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jt/upload-pack-error-report' into maint

Browse Source 
"git upload-pack", which is a counter-part of "git fetch", did not
report a request for a ref that was not advertised as invalid.
This is generally not a problem (because "git fetch" will stop
before making such a request), but is the right thing to do.

* jt/upload-pack-error-report:
  upload-pack: report "not our ref" to client
This commit is contained in:
Junio C Hamano
2017-03-21 15:03:27 -07:00
parent e36e28e697 bdb31eada7
commit f4470f2db0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
upload-pack.c
View File

@ -822,9 +822,13 @@ static void receive_needs(void)
use_include_tag = 1; use_include_tag = 1;
o = parse_object(sha1_buf); o = parse_object(sha1_buf);
if (!o) if (!o) {
packet_write_fmt(1,
"ERR upload-pack: not our ref %s",
sha1_to_hex(sha1_buf));
die("git upload-pack: not our ref %s", die("git upload-pack: not our ref %s",
sha1_to_hex(sha1_buf)); sha1_to_hex(sha1_buf));
}
if (!(o->flags & WANTED)) { if (!(o->flags & WANTED)) {
o->flags |= WANTED; o->flags |= WANTED;
if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1 if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1