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>
Junio C Hamano committed
Nov 6, 2009 at 22:58 UTC
5c5dd6e5a42d8d65362a15fb8f54f11ae6e03e22
1 file changed
+3
-2
t/t1200-tutorial.sh
+3
-2
@@ -149,7 +149,7 @@ test_expect_success 'git show-branch' '
149
150
cat > resolve.expect << EOF
151
Updating VARIABLE..VARIABLE
152
-Fast forward (no commit created; -m option ignored)
152
+FASTFORWARD (no commit created; -m option ignored)
153
example | 1 +
154
hello | 1 +
155
2 files changed, 2 insertions(+), 0 deletions(-)
@@ -158,7 +158,8 @@ EOF
158
test_expect_success 'git resolve' '
159
git checkout mybranch &&
160
git merge -m "Merge upstream changes." master |
161
- sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" >resolve.output &&
161
+ sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
162
+ -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
163
test_cmp resolve.expect resolve.output
164
'
165