From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2012 22:53:02 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.10-rc0~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/556c5e030f17efb412a192a430fe9027840ed718?hp=85551232b56e763ecfcc7222e0858bac4e962c80

Merge branch 'maint'

By Thomas Rast
* maint:
t5704: fix nonportable sed/grep usages
Document the --histogram diff option
---

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9f7cba2be6..ba7cd13483 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -52,6 +52,9 @@ endif::git-format-patch[]
 --patience::
 	Generate a diff using the "patience diff" algorithm.
 
+--histogram::
+	Generate a diff using the "histogram diff" algorithm.
+
 --stat[=<width>[,<name-width>[,<count>]]]::
 	Generate a diffstat.  You can override the default
 	output width for 80-column terminal by `--stat=<width>`.
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