diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:27 -0700 |
| commit | f4470f2db0b15ae14408dcb3b5365aac550ef41e (patch) | |
| tree | 93c705200b7a01d05701a3ba12fc218076cbcf8f /builtin/merge.c | |
| parent | Merge branch 'rs/sha1-file-plug-fallback-base-leak' into maint (diff) | |
| parent | upload-pack: report "not our ref" to client (diff) | |
| download | tgif-f4470f2db0b15ae14408dcb3b5365aac550ef41e.tar.xz | |
Merge branch 'jt/upload-pack-error-report' into maint
"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
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions