t1200: prepare for merging with Fast-forward bikeshedding

A tree-wide bikeshedding to replace "fast forward" into "fast-forward" is
in 'master'.  Since we want to keep this "test modernization" series
mergeable also to the maintenance track, we would need to tweak the test
to accept both old spellings and new spellings.

Sigh...  This kind of headache is the primary reason we try not to allow
such a tree-wide bike-shedding, but the damage has already been done.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 7bd8e068982fd316f7995dc9e5bde3fb882f5769..6bf84755f39378cb3a328a0a1f37b13cdb03a0ca 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -149,7 +149,7 @@ test_expect_success 'git show-branch' '
 
 cat > resolve.expect << EOF
 Updating VARIABLE..VARIABLE
-Fast forward (no commit created; -m option ignored)
+FASTFORWARD (no commit created; -m option ignored)
  example |    1 +
  hello   |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
@@ -158,7 +158,8 @@ EOF
 test_expect_success 'git resolve' '
        git checkout mybranch &&
        git merge -m "Merge upstream changes." master |
-               sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" >resolve.output &&
+               sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
+               -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
        test_cmp resolve.expect resolve.output
 '