From: Michael Haggerty Date: Wed, 30 Oct 2013 05:33:08 +0000 (+0100) Subject: t5536: new test of refspec conflicts when fetching X-Git-Tag: v1.9-rc0~79^2~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2071e05ed27df847e300b51aca661a34a765aea3?hp=2071e05ed27df847e300b51aca661a34a765aea3 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 Signed-off-by: Junio C Hamano ---