Here is what I said in the message I am responding to in the patch
form.
t/lib-log-graph.sh | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/t/lib-log-graph.sh b/t/lib-log-graph.sh
index 999f2600de..bc70f01e84 100644
--- a/t/lib-log-graph.sh
+++ b/t/lib-log-graph.sh
@@ -1,6 +1,12 @@
# Helpers shared by the test scripts for comparing log graphs.
-sanitize_output() {
+sanitize_output () {
+ # Versions of Git that predate 7f814632 ("Use correct grammar
+ # in diffstat summary line", 2012-02-01) did not correctly use
+ # singular when one path was involved, and a handful of rules
+ # were added to work with both older and newer versions of Git
+ # back then. These are probably not relevant anymore, and
+ # we'd want to lose them someday...
sed -e 's/ *$//' \
-e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
-e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
@@ -15,25 +21,25 @@ sanitize_output() {
}
# Assume expected graph is in file `expect`
-test_cmp_graph_file() {
+test_cmp_graph_file () {
git log --graph "$@" >output &&
- sanitize_output >output.trimmed <output &&
- test_i18ncmp expect output.trimmed
+ sanitize_output >output.sanitized <output &&
+ test_i18ncmp expect output.sanitized
}
-test_cmp_graph() {
+test_cmp_graph () {
cat >expect &&
test_cmp_graph_file "$@"
}
# Assume expected graph is in file `expect.colors`
-test_cmp_colored_graph_file() {
+test_cmp_colored_graph_file () {
git log --graph --color=always "$@" >output.colors.raw &&
test_decode_color <output.colors.raw | sed "s/ *\$//" >output.colors &&
test_cmp expect.colors output.colors
}
-test_cmp_colored_graph() {
+test_cmp_colored_graph () {
cat >expect.colors &&
test_cmp_colored_graph_file "$@"
}
--
2.25.1-440-g39558b81cc
