On Tue, Feb 3, 2015 at 4:01 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jeff King <p...@peff.net> writes: >> diff --git a/t/t4122-apply-symlink-inside.sh >> b/t/t4122-apply-symlink-inside.sh >> index 942c5cb..fbba8dd 100755 >> --- a/t/t4122-apply-symlink-inside.sh >> +++ b/t/t4122-apply-symlink-inside.sh >> @@ -112,6 +113,20 @@ test_expect_success SYMLINKS 'do not follow symbolic >> link (same input)' ' >> test_i18ngrep "beyond a symbolic link" error-ct && >> test_must_fail git ls-files --error-unmatch arch/x86_64/dir && >> test_must_fail git ls-files --error-unmatch arch/i386/dir
Broken &&-chain. >> + >> + >arch/i386/dir/file && >> + git add arch/i386/dir/file && > > At this point, the target of the patch application has: > > arch/i386/boot/Makefile > arch/i386/dir/file > arch/x86_64/boot/Makefile > > all of which are regular files. The index and the working tree > match. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
