On 05/05/2015 07:12 AM, Eric Sunshine wrote: > On Fri, May 1, 2015 at 8:25 AM, Michael Haggerty <mhagger@xxxxxxxxxxxx> wrote: >> Add some tests of D/F conflicts (as in, the type of directory vs. file >> conflict that exists between references "refs/foo" and "refs/foo/bar") >> in the context of reference transactions. >> [...] >> Signed-off-by: Michael Haggerty <mhagger@xxxxxxxxxxxx> >> --- >> t/t1404-update-ref-df-conflicts.sh | 107 +++++++++++++++++++++++++++++++++++++ >> 1 file changed, 107 insertions(+) >> create mode 100755 t/t1404-update-ref-df-conflicts.sh >> >> diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh >> new file mode 100755 >> index 0000000..2fc2ac6 >> --- /dev/null >> +++ b/t/t1404-update-ref-df-conflicts.sh >> @@ -0,0 +1,107 @@ >> +#!/bin/sh >> + >> +test_description='Test git update-ref with D/F conflicts' >> +. ./test-lib.sh >> + >> +test_expect_success 'setup' ' >> + >> + git commit --allow-empty -m Initial > > Broken &&-chain. Thanks, Eric. I'll fix it in v2. Michael -- Michael Haggerty mhagger@xxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html