From: Junio C Hamano Date: Fri, 10 Mar 2006 06:42:28 GMT Subject: Re: Make test broken w/ 180b0d7483711120e28289ff7d9fa346eddd5cb7 Message-ID: <7v64mm3inf.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <441119DB.3020207@gmail.com> A Large Angry SCM writes: > *** t1200-tutorial.sh *** > * ok 1: blob > * ok 2: blob 557db03 > * ok 3: git-diff-files -p > * ok 4: git diff > * ok 5: tree > * ok 6: commit > * ok 7: git-diff-index -p HEAD > * ok 8: git diff HEAD > * ok 9: git-whatchanged -p --root > * ok 10: git tag my-first-tag > * ok 11: git checkout -b mybranch > * ok 12: git branch > * ok 13: git resolve now fails > * ok 14: git show-branch > * FAIL 15: git resolve > cmp resolve.expect resolve.output > * ok 16: git show-branch > * ok 17: git repack > * ok 18: git prune-packed > * ok 19: -> only packed objects > * failed 1 among 19 test(s) Thanks. Will push out a fix but it should be trivial. --- diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh index c8a85f9..1002413 100755 --- a/t/t1200-tutorial.sh +++ b/t/t1200-tutorial.sh @@ -128,7 +128,7 @@ test_expect_success 'git show-branch' 'c git checkout mybranch cat > resolve.expect << EOF -Updating from VARIABLE to VARIABLE. +Updating from VARIABLE to VARIABLE example | 1 + hello | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)