diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2013-10-30 06:33:08 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-10-30 14:16:41 -0700 |
| commit | 2071e05ed27df847e300b51aca661a34a765aea3 (patch) | |
| tree | 2297d3b036c7b1a101addd41200a652dae8a91eb /git-add--interactive.perl | |
| parent | ref_remove_duplicates(): avoid redundant bisection (diff) | |
| download | tgif-2071e05ed27df847e300b51aca661a34a765aea3.tar.xz | |
t5536: new test of refspec conflicts when fetching
Add some tests that "git fetch" handles refspec conflicts (i.e., when
the same local reference should be updated from two different remote
references) correctly.
There is a small bug when updating references opportunistically,
namely that an explicit user wish like
git fetch origin \
refs/heads/branch1:refs/remotes/origin/branch2 \
refs/heads/branch2:refs/remotes/origin/branch1
should override a configured refspec like
+refs/heads/*:refs/remotes/origin/*
The current code incorrectly treats this as a fatal error.
In a few commits we will improve the error messages for refspec
conflicts in general and also turn this buggy fatal error into a
warning.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-add--interactive.perl')
0 files changed, 0 insertions, 0 deletions