| commit | f096e6e826678c29e4bfde4d9d1ae1df79074ce3 | |
| author | Michael Haggerty <mhagger@alum.mit.edu> | |
| Wed, 30 Oct 2013 05:33:12 +0000 (30 06:33 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Oct 2013 21:16:42 +0000 (30 14:16 -0700) | ||
| tree | 64cca6251eb19dace502f26cf24688e7583e03aa | treesnapshot (tar.gz zip) |
| parent | 76ea6717fe7dda28966f586e09e02b7b0d5b76cf | commitdiff |
fetch: improve the error messages emitted for conflicting refspecs
If we find two refspecs that want to update the same local reference,
emit an error message that is more informative based on whether one of
the conflicting refspecs is an opportunistic update during a fetch
with explicit command-line refspecs. And especially, do not die if an
opportunistic reference update conflicts with an express wish of the
user; rather, just emit a warning and skip the opportunistic reference
update.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If we find two refspecs that want to update the same local reference,
emit an error message that is more informative based on whether one of
the conflicting refspecs is an opportunistic update during a fetch
with explicit command-line refspecs. And especially, do not die if an
opportunistic reference update conflicts with an express wish of the
user; rather, just emit a warning and skip the opportunistic reference
update.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| remote.c | diffblobblamehistory | |
| t/t5536-fetch-conflicts.sh | diffblobblamehistory |