Merge branch 'jw/gitweb-sample-update'

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index ee5b03ee18ada34a7b8012d219cbb63c4bb7f256..2b883d8174036b7d2246fcd89f239d7ecde049d4 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -146,7 +146,7 @@ check_describe A-* HEAD
 test_expect_success 'describe works from outside repo using --git-dir' '
        git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
        git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
-       grep "^A-[1-9][0-9]\?-g[0-9a-f]\+$" out
+       grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out
 '
 
 check_describe "A-*[0-9a-f]" --dirty
@@ -156,7 +156,7 @@ test_expect_success 'describe --dirty with --work-tree' '
                cd "$TEST_DIRECTORY" &&
                git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
        ) &&
-       grep "^A-[1-9][0-9]\?-g[0-9a-f]\+$" out
+       grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out
 '
 
 test_expect_success 'set-up dirty work tree' '
@@ -170,7 +170,7 @@ test_expect_success 'describe --dirty with --work-tree (dirty)' '
                cd "$TEST_DIRECTORY" &&
                git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
        ) &&
-       grep "^A-[1-9][0-9]\?-g[0-9a-f]\+-dirty$" out
+       grep -E "^A-[1-9][0-9]?-g[0-9a-f]+-dirty$" out
 '
 
 check_describe "A-*[0-9a-f].mod" --dirty=.mod
@@ -180,7 +180,7 @@ test_expect_success 'describe --dirty=.mod with --work-tree (dirty)' '
                cd "$TEST_DIRECTORY" &&
                git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
        ) &&
-       grep "^A-[1-9][0-9]\?-g[0-9a-f]\+.mod$" out
+       grep -E "^A-[1-9][0-9]?-g[0-9a-f]+.mod$" out
 '
 
 test_expect_success 'describe --dirty HEAD' '