{"thread":{"id":"3617","subject":"Make test broken w/ 180b0d7483711120e28289ff7d9fa346eddd5cb7","startedAt":"2006-03-10T06:16:59Z","lastAt":"2006-03-10T06:42:28Z","messageCount":2,"participants":["A Large Angry SCM","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"17416","messageId":"441119DB.3020207@gmail.com","threadId":"3617","inReplyTo":null,"subject":"Make test broken w/ 180b0d7483711120e28289ff7d9fa346eddd5cb7","fromName":"A Large Angry SCM","fromEmail":"gitzilla@gmail.com","sentAt":"2006-03-10T06:16:59Z","receivedAt":"2006-03-10T06:16:59Z","isPatch":false,"sender":{"key":"gitzilla@gmail.com","avatar":"https://gravatar.com/avatar/354625c442439908ff3dd99757dee330e29e9df7847472384faf7a00add247fb?d=mp&s=160"},"body":"*** t1200-tutorial.sh ***\n*   ok 1: blob\n*   ok 2: blob 557db03\n*   ok 3: git-diff-files -p\n*   ok 4: git diff\n*   ok 5: tree\n*   ok 6: commit\n*   ok 7: git-diff-index -p HEAD\n*   ok 8: git diff HEAD\n*   ok 9: git-whatchanged -p --root\n*   ok 10: git tag my-first-tag\n*   ok 11: git checkout -b mybranch\n*   ok 12: git branch\n*   ok 13: git resolve now fails\n*   ok 14: git show-branch\n* FAIL 15: git resolve\n         cmp resolve.expect resolve.output\n*   ok 16: git show-branch\n*   ok 17: git repack\n*   ok 18: git prune-packed\n*   ok 19: -> only packed objects\n* failed 1 among 19 test(s)\n"},{"id":"17417","messageId":"7v64mm3inf.fsf@assigned-by-dhcp.cox.net","threadId":"3617","inReplyTo":"441119DB.3020207@gmail.com","subject":"Re: Make test broken w/ 180b0d7483711120e28289ff7d9fa346eddd5cb7","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-03-10T06:42:28Z","receivedAt":"2006-03-10T06:42:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"A Large Angry SCM <gitzilla@gmail.com> writes:\n\n> *** t1200-tutorial.sh ***\n> *   ok 1: blob\n> *   ok 2: blob 557db03\n> *   ok 3: git-diff-files -p\n> *   ok 4: git diff\n> *   ok 5: tree\n> *   ok 6: commit\n> *   ok 7: git-diff-index -p HEAD\n> *   ok 8: git diff HEAD\n> *   ok 9: git-whatchanged -p --root\n> *   ok 10: git tag my-first-tag\n> *   ok 11: git checkout -b mybranch\n> *   ok 12: git branch\n> *   ok 13: git resolve now fails\n> *   ok 14: git show-branch\n> * FAIL 15: git resolve\n>         cmp resolve.expect resolve.output\n> *   ok 16: git show-branch\n> *   ok 17: git repack\n> *   ok 18: git prune-packed\n> *   ok 19: -> only packed objects\n> * failed 1 among 19 test(s)\n\nThanks.  Will push out a fix but it should be trivial.\n\n---\n\ndiff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh\nindex c8a85f9..1002413 100755\n--- a/t/t1200-tutorial.sh\n+++ b/t/t1200-tutorial.sh\n@@ -128,7 +128,7 @@ test_expect_success 'git show-branch' 'c\n git checkout mybranch\n \n cat > resolve.expect << EOF\n-Updating from VARIABLE to VARIABLE.\n+Updating from VARIABLE to VARIABLE\n  example |    1 +\n  hello   |    1 +\n  2 files changed, 2 insertions(+), 0 deletions(-)\n"}]}