xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 3e9edda1ca6a0c6c8e3022c1f639f7ec7728f90f..ae8ee11183833fd4610adb1f83763eba381f7850 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -28,39 +28,39 @@ check_describe () {
 test_expect_success setup '
 
        test_tick &&
-       echo one >file && git-add file && git-commit -m initial &&
-       one=$(git-rev-parse HEAD) &&
+       echo one >file && git add file && git-commit -m initial &&
+       one=$(git rev-parse HEAD) &&
 
        test_tick &&
-       echo two >file && git-add file && git-commit -m second &&
-       two=$(git-rev-parse HEAD) &&
+       echo two >file && git add file && git-commit -m second &&
+       two=$(git rev-parse HEAD) &&
 
        test_tick &&
-       echo three >file && git-add file && git-commit -m third &&
+       echo three >file && git add file && git-commit -m third &&
 
        test_tick &&
-       echo A >file && git-add file && git-commit -m A &&
+       echo A >file && git add file && git-commit -m A &&
        test_tick &&
        git-tag -a -m A A &&
 
        test_tick &&
-       echo c >file && git-add file && git-commit -m c &&
+       echo c >file && git add file && git-commit -m c &&
        test_tick &&
        git-tag c &&
 
        git reset --hard $two &&
        test_tick &&
-       echo B >side && git-add side && git-commit -m B &&
+       echo B >side && git add side && git-commit -m B &&
        test_tick &&
        git-tag -a -m B B &&
 
        test_tick &&
        git-merge -m Merged c &&
-       merged=$(git-rev-parse HEAD) &&
+       merged=$(git rev-parse HEAD) &&
 
        git reset --hard $two &&
        test_tick &&
-       echo D >another && git-add another && git-commit -m D &&
+       echo D >another && git add another && git-commit -m D &&
        test_tick &&
        git-tag -a -m D D &&
 
@@ -77,7 +77,7 @@ test_expect_success setup '
        git-merge -m Merged $merged &&
 
        test_tick &&
-       echo X >file && echo X >side && git-add file side &&
+       echo X >file && echo X >side && git add file side &&
        git-commit -m x
 
 '