diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-22 21:20:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-22 21:20:19 -0800 |
| commit | c65a2884eae159bad540135479bc8afe20ff62d1 (patch) | |
| tree | beb36ccb4a93dc64eaa30529884195a617c2cf60 /t | |
| parent | 60a3fbf50032f8baaf9e10d3e3176a3bed758e20 (diff) | |
| parent | b9cc405612f6badded21cb526cdeaa627fecbb37 (diff) | |
| download | git-c65a2884eae159bad540135479bc8afe20ff62d1.tar.gz | |
Merge branch 'ab/bsd-fixes'
Test portability fix.
* ab/bsd-fixes:
commit-graph tests: fix unportable "dd" invocation
tests: fix unportable "\?" and "\+" regex syntax
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5318-commit-graph.sh | 2 | ||||
| -rwxr-xr-x | t/t6120-describe.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index d4bd1522fe..561796f280 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -382,7 +382,7 @@ corrupt_graph_and_verify() { test_when_finished mv commit-graph-backup $objdir/info/commit-graph && cp $objdir/info/commit-graph commit-graph-backup && printf "$data" | dd of="$objdir/info/commit-graph" bs=1 seek="$pos" conv=notrunc && - dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" count=0 && + dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" if=/dev/null && generate_zero_bytes $(($orig_size - $zero_pos)) >>"$objdir/info/commit-graph" && test_must_fail git commit-graph verify 2>test_err && grep -v "^+" test_err >err && diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index ee5b03ee18..2b883d8174 100755 --- 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' ' |