diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:02 -0800 |
| commit | 556c5e030f17efb412a192a430fe9027840ed718 (patch) | |
| tree | 1600c629829c2b1f029af13da527c3380b25c5e7 /t | |
| parent | perf: compare diff algorithms (diff) | |
| parent | t5704: fix nonportable sed/grep usages (diff) | |
| download | tgif-556c5e030f17efb412a192a430fe9027840ed718.tar.xz | |
Merge branch 'maint'
By Thomas Rast
* maint:
t5704: fix nonportable sed/grep usages
Document the --histogram diff option
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5704-bundle.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh index a51c8b0560..9e43731fe5 100755 --- a/t/t5704-bundle.sh +++ b/t/t5704-bundle.sh @@ -54,8 +54,8 @@ test_expect_success 'ridiculously long subject in boundary' ' git bundle list-heads long-subject-bundle.bdl >heads && test -s heads && git fetch long-subject-bundle.bdl && - sed -n "/^-/{p;q}" long-subject-bundle.bdl >boundary && - grep "^-$_x40 " boundary + sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary && + grep "^-[0-9a-f]\\{40\\} " boundary ' test_done |