@matheusbsbs / matheus-bagliano / commits / 7f814632f5

Use correct grammar in diffstat summary line

"git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Feb 1, 2012 at 19:55 UTC 7f814632f5d4d7af9f4225ece6039dbc44e03079
69 files changed +168 -118
Documentation/gitcore-tutorial.txt
+1 -1
@@ -1004,7 +1004,7 @@ Updating from ae3a2da... to a80b4aa....
1004 Fast-forward (no commit created; -m option ignored)
1005 example | 1 +
1006 hello | 1 +
1007 - 2 files changed, 2 insertions(+), 0 deletions(-)
1007 + 2 files changed, 2 insertions(+)
1008 ----------------
1009
1010 Because your branch did not contain anything more than what had
Documentation/gittutorial-2.txt
+2 -2
@@ -34,12 +34,12 @@ $ echo 'hello world' > file.txt
34 $ git add .
35 $ git commit -a -m "initial commit"
36 [master (root-commit) 54196cc] initial commit
37 - 1 files changed, 1 insertions(+), 0 deletions(-)
37 + 1 file changed, 1 insertion(+)
38 create mode 100644 file.txt
39 $ echo 'hello world!' >file.txt
40 $ git commit -a -m "add emphasis"
41 [master c4d59f3] add emphasis
42 - 1 files changed, 1 insertions(+), 1 deletions(-)
42 + 1 file changed, 1 insertion(+), 1 deletion(-)
43 ------------------------------------------------
44
45 What are the 7 digits of hex that git responded to the commit with?
builtin/apply.c
+2 -1
@@ -14,6 +14,7 @@
14 #include "builtin.h"
15 #include "string-list.h"
16 #include "dir.h"
17 +#include "diff.h"
18 #include "parse-options.h"
19
20 /*
@@ -3241,7 +3242,7 @@ static void stat_patch_list(struct patch *patch)
3242 show_stats(patch);
3243 }
3244
3244 - printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
3245 + print_stat_summary(stdout, files, adds, dels);
3246 }
3247
3248 static void numstat_patch_list(struct patch *patch)
diff.c
+51 -5
@@ -1322,6 +1322,55 @@ static void fill_print_name(struct diffstat_file *file)
1322 file->print_name = pname;
1323 }
1324
1325 +int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
1326 +{
1327 + struct strbuf sb = STRBUF_INIT;
1328 + int ret;
1329 +
1330 + if (!files) {
1331 + assert(insertions == 0 && deletions == 0);
1332 + return fputs(_(" 0 files changed\n"), fp);
1333 + }
1334 +
1335 + strbuf_addf(&sb,
1336 + Q_(" %d file changed", " %d files changed", files),
1337 + files);
1338 +
1339 + /*
1340 + * For binary diff, the caller may want to print "x files
1341 + * changed" with insertions == 0 && deletions == 0.
1342 + *
1343 + * Not omitting "0 insertions(+), 0 deletions(-)" in this case
1344 + * is probably less confusing (i.e skip over "2 files changed
1345 + * but nothing about added/removed lines? Is this a bug in Git?").
1346 + */
1347 + if (insertions || deletions == 0) {
1348 + /*
1349 + * TRANSLATORS: "+" in (+) is a line addition marker;
1350 + * do not translate it.
1351 + */
1352 + strbuf_addf(&sb,
1353 + Q_(", %d insertion(+)", ", %d insertions(+)",
1354 + insertions),
1355 + insertions);
1356 + }
1357 +
1358 + if (deletions || insertions == 0) {
1359 + /*
1360 + * TRANSLATORS: "-" in (-) is a line removal marker;
1361 + * do not translate it.
1362 + */
1363 + strbuf_addf(&sb,
1364 + Q_(", %d deletion(-)", ", %d deletions(-)",
1365 + deletions),
1366 + deletions);
1367 + }
1368 + strbuf_addch(&sb, '\n');
1369 + ret = fputs(sb.buf, fp);
1370 + strbuf_release(&sb);
1371 + return ret;
1372 +}
1373 +
1374 static void show_stats(struct diffstat_t *data, struct diff_options *options)
1375 {
1376 int i, len, add, del, adds = 0, dels = 0;
@@ -1475,9 +1524,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
1524 extra_shown = 1;
1525 }
1526 fprintf(options->file, "%s", line_prefix);
1478 - fprintf(options->file,
1479 - " %d files changed, %d insertions(+), %d deletions(-)\n",
1480 - total_files, adds, dels);
1527 + print_stat_summary(options->file, total_files, adds, dels);
1528 }
1529
1530 static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
@@ -1507,8 +1554,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option
1554 options->output_prefix_data);
1555 fprintf(options->file, "%s", msg->buf);
1556 }
1510 - fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
1511 - total_files, adds, dels);
1557 + print_stat_summary(options->file, total_files, adds, dels);
1558 }
1559
1560 static void show_numstat(struct diffstat_t *data, struct diff_options *options)
diff.h
+3
@@ -324,4 +324,7 @@ extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
324
325 extern int parse_rename_score(const char **cp_p);
326
327 +extern int print_stat_summary(FILE *fp, int files,
328 + int insertions, int deletions);
329 +
330 #endif /* DIFF_H */
t/t1200-tutorial.sh
+1 -1
@@ -156,7 +156,7 @@ Updating VARIABLE..VARIABLE
156 FASTFORWARD (no commit created; -m option ignored)
157 example | 1 +
158 hello | 1 +
159 - 2 files changed, 2 insertions(+), 0 deletions(-)
159 + 2 files changed, 2 insertions(+)
160 EOF
161
162 test_expect_success 'git resolve' '
t/t3300-funny-names.sh
+1 -1
@@ -167,7 +167,7 @@ test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \
167 test_expect_success TABS_IN_FILENAMES 'setup expect' '
168 cat >expected <<\EOF
169 "tabs\t,\" (dq) and spaces"
170 - 1 files changed, 0 insertions(+), 0 deletions(-)
170 + 1 file changed, 0 insertions(+), 0 deletions(-)
171 EOF
172 '
173
t/t3508-cherry-pick-many-commits.sh
+6 -6
@@ -38,13 +38,13 @@ test_expect_success 'cherry-pick first..fourth works' '
38 cat <<-\EOF >expected &&
39 [master OBJID] second
40 Author: A U Thor <author@example.com>
41 - 1 files changed, 1 insertions(+), 0 deletions(-)
41 + 1 file changed, 1 insertion(+)
42 [master OBJID] third
43 Author: A U Thor <author@example.com>
44 - 1 files changed, 1 insertions(+), 0 deletions(-)
44 + 1 file changed, 1 insertion(+)
45 [master OBJID] fourth
46 Author: A U Thor <author@example.com>
47 - 1 files changed, 1 insertions(+), 0 deletions(-)
47 + 1 file changed, 1 insertion(+)
48 EOF
49
50 git checkout -f master &&
@@ -64,15 +64,15 @@ test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
64 Trying simple merge.
65 [master OBJID] second
66 Author: A U Thor <author@example.com>
67 - 1 files changed, 1 insertions(+), 0 deletions(-)
67 + 1 file changed, 1 insertion(+)
68 Trying simple merge.
69 [master OBJID] third
70 Author: A U Thor <author@example.com>
71 - 1 files changed, 1 insertions(+), 0 deletions(-)
71 + 1 file changed, 1 insertion(+)
72 Trying simple merge.
73 [master OBJID] fourth
74 Author: A U Thor <author@example.com>
75 - 1 files changed, 1 insertions(+), 0 deletions(-)
75 + 1 file changed, 1 insertion(+)
76 EOF
77
78 git checkout -f master &&
t/t3903-stash.sh
+2 -2
@@ -444,7 +444,7 @@ test_expect_success 'stash show - stashes on stack, stash-like argument' '
444 git reset --hard &&
445 cat >expected <<-EOF &&
446 file | 1 +
447 - 1 files changed, 1 insertions(+), 0 deletions(-)
447 + 1 file changed, 1 insertion(+)
448 EOF
449 git stash show ${STASH_ID} >actual &&
450 test_cmp expected actual
@@ -482,7 +482,7 @@ test_expect_success 'stash show - no stashes on stack, stash-like argument' '
482 git reset --hard &&
483 cat >expected <<-EOF &&
484 file | 1 +
485 - 1 files changed, 1 insertions(+), 0 deletions(-)
485 + 1 file changed, 1 insertion(+)
486 EOF
487 git stash show ${STASH_ID} >actual &&
488 test_cmp expected actual
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
+1 -1
@@ -2,7 +2,7 @@ $ git diff-tree --cc --patch-with-stat --summary master
2 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 - 2 files changed, 5 insertions(+), 0 deletions(-)
5 + 2 files changed, 5 insertions(+)
6
7 diff --cc dir/sub
8 index cead32e,7289e35..992913c
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side
+1 -1
@@ -3,7 +3,7 @@ c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
3 dir/sub | 2 ++
4 file0 | 3 +++
5 file3 | 4 ++++
6 - 3 files changed, 9 insertions(+), 0 deletions(-)
6 + 3 files changed, 9 insertions(+)
7 create mode 100644 file3
8
9 diff --git a/dir/sub b/dir/sub
t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
+1 -1
@@ -2,7 +2,7 @@ $ git diff-tree --cc --patch-with-stat master
2 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 - 2 files changed, 5 insertions(+), 0 deletions(-)
5 + 2 files changed, 5 insertions(+)
6
7 diff --cc dir/sub
8 index cead32e,7289e35..992913c
t/t4013/diff.diff-tree_--cc_--stat_--summary_master
+1 -1
@@ -2,5 +2,5 @@ $ git diff-tree --cc --stat --summary master
2 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 - 2 files changed, 5 insertions(+), 0 deletions(-)
5 + 2 files changed, 5 insertions(+)
6 $
t/t4013/diff.diff-tree_--cc_--stat_--summary_side
+1 -1
@@ -3,6 +3,6 @@ c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
3 dir/sub | 2 ++
4 file0 | 3 +++
5 file3 | 4 ++++
6 - 3 files changed, 9 insertions(+), 0 deletions(-)
6 + 3 files changed, 9 insertions(+)
7 create mode 100644 file3
8 $
t/t4013/diff.diff-tree_--cc_--stat_master
+1 -1
@@ -2,5 +2,5 @@ $ git diff-tree --cc --stat master
2 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 - 2 files changed, 5 insertions(+), 0 deletions(-)
5 + 2 files changed, 5 insertions(+)
6 $
t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial
+1 -1
@@ -3,7 +3,7 @@ $ git diff-tree --pretty=oneline --root --patch-with-stat initial
3 dir/sub | 2 ++
4 file0 | 3 +++
5 file2 | 3 +++
6 - 3 files changed, 8 insertions(+), 0 deletions(-)
6 + 3 files changed, 8 insertions(+)
7
8 diff --git a/dir/sub b/dir/sub
9 new file mode 100644
t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side
+1 -1
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12
13 diff --git a/dir/sub b/dir/sub
14 index 35d242b..7289e35 100644
t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial
+1 -1
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file2 | 3 +++
11 - 3 files changed, 8 insertions(+), 0 deletions(-)
11 + 3 files changed, 8 insertions(+)
12
13 diff --git a/dir/sub b/dir/sub
14 new file mode 100644
t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial
+1 -1
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file2 | 3 +++
11 - 3 files changed, 8 insertions(+), 0 deletions(-)
11 + 3 files changed, 8 insertions(+)
12 create mode 100644 dir/sub
13 create mode 100644 file0
14 create mode 100644 file2
t/t4013/diff.diff-tree_--pretty_--root_--stat_initial
+1 -1
@@ -8,5 +8,5 @@ Date: Mon Jun 26 00:00:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file2 | 3 +++
11 - 3 files changed, 8 insertions(+), 0 deletions(-)
11 + 3 files changed, 8 insertions(+)
12 $
t/t4013/diff.diff-tree_--root_--patch-with-stat_initial
+1 -1
@@ -3,7 +3,7 @@ $ git diff-tree --root --patch-with-stat initial
3 dir/sub | 2 ++
4 file0 | 3 +++
5 file2 | 3 +++
6 - 3 files changed, 8 insertions(+), 0 deletions(-)
6 + 3 files changed, 8 insertions(+)
7
8 diff --git a/dir/sub b/dir/sub
9 new file mode 100644
t/t4013/diff.diff-tree_-c_--stat_--summary_master
+1 -1
@@ -2,5 +2,5 @@ $ git diff-tree -c --stat --summary master
2 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 - 2 files changed, 5 insertions(+), 0 deletions(-)
5 + 2 files changed, 5 insertions(+)
6 $
t/t4013/diff.diff-tree_-c_--stat_--summary_side
+1 -1
@@ -3,6 +3,6 @@ c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
3 dir/sub | 2 ++
4 file0 | 3 +++
5 file3 | 4 ++++
6 - 3 files changed, 9 insertions(+), 0 deletions(-)
6 + 3 files changed, 9 insertions(+)
7 create mode 100644 file3
8 $
t/t4013/diff.diff-tree_-c_--stat_master
+1 -1
@@ -2,5 +2,5 @@ $ git diff-tree -c --stat master
2 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 - 2 files changed, 5 insertions(+), 0 deletions(-)
5 + 2 files changed, 5 insertions(+)
6 $
t/t4013/diff.diff_--patch-with-stat_-r_initial..side
+1 -1
@@ -2,7 +2,7 @@ $ git diff --patch-with-stat -r initial..side
2 dir/sub | 2 ++
3 file0 | 3 +++
4 file3 | 4 ++++
5 - 3 files changed, 9 insertions(+), 0 deletions(-)
5 + 3 files changed, 9 insertions(+)
6
7 diff --git a/dir/sub b/dir/sub
8 index 35d242b..7289e35 100644
t/t4013/diff.diff_--patch-with-stat_initial..side
+1 -1
@@ -2,7 +2,7 @@ $ git diff --patch-with-stat initial..side
2 dir/sub | 2 ++
3 file0 | 3 +++
4 file3 | 4 ++++
5 - 3 files changed, 9 insertions(+), 0 deletions(-)
5 + 3 files changed, 9 insertions(+)
6
7 diff --git a/dir/sub b/dir/sub
8 index 35d242b..7289e35 100644
t/t4013/diff.diff_--stat_initial..side
+1 -1
@@ -2,5 +2,5 @@ $ git diff --stat initial..side
2 dir/sub | 2 ++
3 file0 | 3 +++
4 file3 | 4 ++++
5 - 3 files changed, 9 insertions(+), 0 deletions(-)
5 + 3 files changed, 9 insertions(+)
6 $
t/t4013/diff.diff_-r_--stat_initial..side
+1 -1
@@ -2,5 +2,5 @@ $ git diff -r --stat initial..side
2 dir/sub | 2 ++
3 file0 | 3 +++
4 file3 | 4 ++++
5 - 3 files changed, 9 insertions(+), 0 deletions(-)
5 + 3 files changed, 9 insertions(+)
6 $
t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
+1 -1
@@ -15,7 +15,7 @@ Content-Transfer-Encoding: 8bit
15 dir/sub | 2 ++
16 file0 | 3 +++
17 file3 | 4 ++++
18 - 3 files changed, 9 insertions(+), 0 deletions(-)
18 + 3 files changed, 9 insertions(+)
19 create mode 100644 file3
20
21
t/t4013/diff.format-patch_--attach_--stdout_initial..master
+2 -2
@@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
75 ---
76 dir/sub | 2 ++
77 file1 | 3 +++
78 - 2 files changed, 5 insertions(+), 0 deletions(-)
78 + 2 files changed, 5 insertions(+)
79 create mode 100644 file1
80
81
@@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit
124 dir/sub | 2 ++
125 file0 | 3 +++
126 file3 | 4 ++++
127 - 3 files changed, 9 insertions(+), 0 deletions(-)
127 + 3 files changed, 9 insertions(+)
128 create mode 100644 file3
129
130
t/t4013/diff.format-patch_--attach_--stdout_initial..master^
+1 -1
@@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
75 ---
76 dir/sub | 2 ++
77 file1 | 3 +++
78 - 2 files changed, 5 insertions(+), 0 deletions(-)
78 + 2 files changed, 5 insertions(+)
79 create mode 100644 file1
80
81
t/t4013/diff.format-patch_--attach_--stdout_initial..side
+1 -1
@@ -15,7 +15,7 @@ Content-Transfer-Encoding: 8bit
15 dir/sub | 2 ++
16 file0 | 3 +++
17 file3 | 4 ++++
18 - 3 files changed, 9 insertions(+), 0 deletions(-)
18 + 3 files changed, 9 insertions(+)
19 create mode 100644 file3
20
21
t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
+2 -2
@@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
75 ---
76 dir/sub | 2 ++
77 file1 | 3 +++
78 - 2 files changed, 5 insertions(+), 0 deletions(-)
78 + 2 files changed, 5 insertions(+)
79 create mode 100644 file1
80
81
@@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit
124 dir/sub | 2 ++
125 file0 | 3 +++
126 file3 | 4 ++++
127 - 3 files changed, 9 insertions(+), 0 deletions(-)
127 + 3 files changed, 9 insertions(+)
128 create mode 100644 file3
129
130
t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
+2 -2
@@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
75 ---
76 dir/sub | 2 ++
77 file1 | 3 +++
78 - 2 files changed, 5 insertions(+), 0 deletions(-)
78 + 2 files changed, 5 insertions(+)
79 create mode 100644 file1
80
81
@@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit
124 dir/sub | 2 ++
125 file0 | 3 +++
126 file3 | 4 ++++
127 - 3 files changed, 9 insertions(+), 0 deletions(-)
127 + 3 files changed, 9 insertions(+)
128 create mode 100644 file3
129
130
t/t4013/diff.format-patch_--inline_--stdout_initial..master
+2 -2
@@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
75 ---
76 dir/sub | 2 ++
77 file1 | 3 +++
78 - 2 files changed, 5 insertions(+), 0 deletions(-)
78 + 2 files changed, 5 insertions(+)
79 create mode 100644 file1
80
81
@@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit
124 dir/sub | 2 ++
125 file0 | 3 +++
126 file3 | 4 ++++
127 - 3 files changed, 9 insertions(+), 0 deletions(-)
127 + 3 files changed, 9 insertions(+)
128 create mode 100644 file3
129
130
t/t4013/diff.format-patch_--inline_--stdout_initial..master^
+1 -1
@@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
75 ---
76 dir/sub | 2 ++
77 file1 | 3 +++
78 - 2 files changed, 5 insertions(+), 0 deletions(-)
78 + 2 files changed, 5 insertions(+)
79 create mode 100644 file1
80
81
t/t4013/diff.format-patch_--inline_--stdout_initial..side
+1 -1
@@ -15,7 +15,7 @@ Content-Transfer-Encoding: 8bit
15 dir/sub | 2 ++
16 file0 | 3 +++
17 file3 | 4 ++++
18 - 3 files changed, 9 insertions(+), 0 deletions(-)
18 + 3 files changed, 9 insertions(+)
19 create mode 100644 file3
20
21
t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
+1 -1
@@ -75,7 +75,7 @@ Subject: [DIFFERENT_PREFIX 2/2] Third
75 ---
76 dir/sub | 2 ++
77 file1 | 3 +++
78 - 2 files changed, 5 insertions(+), 0 deletions(-)
78 + 2 files changed, 5 insertions(+)
79 create mode 100644 file1
80
81 diff --git a/dir/sub b/dir/sub
t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
+2 -2
@@ -53,7 +53,7 @@ Subject: [PATCH] Third
53 ---
54 dir/sub | 2 ++
55 file1 | 3 +++
56 - 2 files changed, 5 insertions(+), 0 deletions(-)
56 + 2 files changed, 5 insertions(+)
57 create mode 100644 file1
58
59 diff --git a/dir/sub b/dir/sub
@@ -88,7 +88,7 @@ Subject: [PATCH] Side
88 dir/sub | 2 ++
89 file0 | 3 +++
90 file3 | 4 ++++
91 - 3 files changed, 9 insertions(+), 0 deletions(-)
91 + 3 files changed, 9 insertions(+)
92 create mode 100644 file3
93
94 diff --git a/dir/sub b/dir/sub
t/t4013/diff.format-patch_--stdout_--numbered_initial..master
+2 -2
@@ -53,7 +53,7 @@ Subject: [PATCH 2/3] Third
53 ---
54 dir/sub | 2 ++
55 file1 | 3 +++
56 - 2 files changed, 5 insertions(+), 0 deletions(-)
56 + 2 files changed, 5 insertions(+)
57 create mode 100644 file1
58
59 diff --git a/dir/sub b/dir/sub
@@ -88,7 +88,7 @@ Subject: [PATCH 3/3] Side
88 dir/sub | 2 ++
89 file0 | 3 +++
90 file3 | 4 ++++
91 - 3 files changed, 9 insertions(+), 0 deletions(-)
91 + 3 files changed, 9 insertions(+)
92 create mode 100644 file3
93
94 diff --git a/dir/sub b/dir/sub
t/t4013/diff.format-patch_--stdout_initial..master
+2 -2
@@ -53,7 +53,7 @@ Subject: [PATCH 2/3] Third
53 ---
54 dir/sub | 2 ++
55 file1 | 3 +++
56 - 2 files changed, 5 insertions(+), 0 deletions(-)
56 + 2 files changed, 5 insertions(+)
57 create mode 100644 file1
58
59 diff --git a/dir/sub b/dir/sub
@@ -88,7 +88,7 @@ Subject: [PATCH 3/3] Side
88 dir/sub | 2 ++
89 file0 | 3 +++
90 file3 | 4 ++++
91 - 3 files changed, 9 insertions(+), 0 deletions(-)
91 + 3 files changed, 9 insertions(+)
92 create mode 100644 file3
93
94 diff --git a/dir/sub b/dir/sub
t/t4013/diff.format-patch_--stdout_initial..master^
+1 -1
@@ -53,7 +53,7 @@ Subject: [PATCH 2/2] Third
53 ---
54 dir/sub | 2 ++
55 file1 | 3 +++
56 - 2 files changed, 5 insertions(+), 0 deletions(-)
56 + 2 files changed, 5 insertions(+)
57 create mode 100644 file1
58
59 diff --git a/dir/sub b/dir/sub
t/t4013/diff.format-patch_--stdout_initial..side
+1 -1
@@ -8,7 +8,7 @@ Subject: [PATCH] Side
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12 create mode 100644 file3
13
14 diff --git a/dir/sub b/dir/sub
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
+3 -3
@@ -13,7 +13,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
13 Side
14 ---
15 dir/sub | 2 ++
16 - 1 files changed, 2 insertions(+), 0 deletions(-)
16 + 1 file changed, 2 insertions(+)
17
18 diff --git a/dir/sub b/dir/sub
19 index 35d242b..7289e35 100644
@@ -32,7 +32,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
32 Third
33 ---
34 dir/sub | 2 ++
35 - 1 files changed, 2 insertions(+), 0 deletions(-)
35 + 1 file changed, 2 insertions(+)
36
37 diff --git a/dir/sub b/dir/sub
38 index 8422d40..cead32e 100644
@@ -54,7 +54,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
54 This is the second commit.
55 ---
56 dir/sub | 2 ++
57 - 1 files changed, 2 insertions(+), 0 deletions(-)
57 + 1 file changed, 2 insertions(+)
58
59 diff --git a/dir/sub b/dir/sub
60 index 35d242b..8422d40 100644
t/t4013/diff.log_--patch-with-stat_master
+2 -2
@@ -15,7 +15,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
15 dir/sub | 2 ++
16 file0 | 3 +++
17 file3 | 4 ++++
18 - 3 files changed, 9 insertions(+), 0 deletions(-)
18 + 3 files changed, 9 insertions(+)
19
20 diff --git a/dir/sub b/dir/sub
21 index 35d242b..7289e35 100644
@@ -56,7 +56,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
56 ---
57 dir/sub | 2 ++
58 file1 | 3 +++
59 - 2 files changed, 5 insertions(+), 0 deletions(-)
59 + 2 files changed, 5 insertions(+)
60
61 diff --git a/dir/sub b/dir/sub
62 index 8422d40..cead32e 100644
t/t4013/diff.log_--patch-with-stat_master_--_dir_
+3 -3
@@ -13,7 +13,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
13 Side
14 ---
15 dir/sub | 2 ++
16 - 1 files changed, 2 insertions(+), 0 deletions(-)
16 + 1 file changed, 2 insertions(+)
17
18 diff --git a/dir/sub b/dir/sub
19 index 35d242b..7289e35 100644
@@ -32,7 +32,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
32 Third
33 ---
34 dir/sub | 2 ++
35 - 1 files changed, 2 insertions(+), 0 deletions(-)
35 + 1 file changed, 2 insertions(+)
36
37 diff --git a/dir/sub b/dir/sub
38 index 8422d40..cead32e 100644
@@ -54,7 +54,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
54 This is the second commit.
55 ---
56 dir/sub | 2 ++
57 - 1 files changed, 2 insertions(+), 0 deletions(-)
57 + 1 file changed, 2 insertions(+)
58
59 diff --git a/dir/sub b/dir/sub
60 index 35d242b..8422d40 100644
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
+4 -4
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000
8
9 dir/sub | 2 ++
10 file0 | 3 +++
11 - 2 files changed, 5 insertions(+), 0 deletions(-)
11 + 2 files changed, 5 insertions(+)
12
13 diff --cc dir/sub
14 index cead32e,7289e35..992913c
@@ -47,7 +47,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
47 dir/sub | 2 ++
48 file0 | 3 +++
49 file3 | 4 ++++
50 - 3 files changed, 9 insertions(+), 0 deletions(-)
50 + 3 files changed, 9 insertions(+)
51 create mode 100644 file3
52
53 diff --git a/dir/sub b/dir/sub
@@ -89,7 +89,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
89 ---
90 dir/sub | 2 ++
91 file1 | 3 +++
92 - 2 files changed, 5 insertions(+), 0 deletions(-)
92 + 2 files changed, 5 insertions(+)
93 create mode 100644 file1
94
95 diff --git a/dir/sub b/dir/sub
@@ -165,7 +165,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
165 dir/sub | 2 ++
166 file0 | 3 +++
167 file2 | 3 +++
168 - 3 files changed, 8 insertions(+), 0 deletions(-)
168 + 3 files changed, 8 insertions(+)
169 create mode 100644 dir/sub
170 create mode 100644 file0
171 create mode 100644 file2
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
+3 -3
@@ -15,7 +15,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
15 dir/sub | 2 ++
16 file0 | 3 +++
17 file3 | 4 ++++
18 - 3 files changed, 9 insertions(+), 0 deletions(-)
18 + 3 files changed, 9 insertions(+)
19 create mode 100644 file3
20
21 diff --git a/dir/sub b/dir/sub
@@ -57,7 +57,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
57 ---
58 dir/sub | 2 ++
59 file1 | 3 +++
60 - 2 files changed, 5 insertions(+), 0 deletions(-)
60 + 2 files changed, 5 insertions(+)
61 create mode 100644 file1
62
63 diff --git a/dir/sub b/dir/sub
@@ -133,7 +133,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
133 dir/sub | 2 ++
134 file0 | 3 +++
135 file2 | 3 +++
136 - 3 files changed, 8 insertions(+), 0 deletions(-)
136 + 3 files changed, 8 insertions(+)
137 create mode 100644 dir/sub
138 create mode 100644 file0
139 create mode 100644 file2
t/t4013/diff.log_--root_--patch-with-stat_master
+3 -3
@@ -15,7 +15,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
15 dir/sub | 2 ++
16 file0 | 3 +++
17 file3 | 4 ++++
18 - 3 files changed, 9 insertions(+), 0 deletions(-)
18 + 3 files changed, 9 insertions(+)
19
20 diff --git a/dir/sub b/dir/sub
21 index 35d242b..7289e35 100644
@@ -56,7 +56,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
56 ---
57 dir/sub | 2 ++
58 file1 | 3 +++
59 - 2 files changed, 5 insertions(+), 0 deletions(-)
59 + 2 files changed, 5 insertions(+)
60
61 diff --git a/dir/sub b/dir/sub
62 index 8422d40..cead32e 100644
@@ -130,7 +130,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
130 dir/sub | 2 ++
131 file0 | 3 +++
132 file2 | 3 +++
133 - 3 files changed, 8 insertions(+), 0 deletions(-)
133 + 3 files changed, 8 insertions(+)
134
135 diff --git a/dir/sub b/dir/sub
136 new file mode 100644
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
+4 -4
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000
8
9 dir/sub | 2 ++
10 file0 | 3 +++
11 - 2 files changed, 5 insertions(+), 0 deletions(-)
11 + 2 files changed, 5 insertions(+)
12
13 diff --combined dir/sub
14 index cead32e,7289e35..992913c
@@ -47,7 +47,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
47 dir/sub | 2 ++
48 file0 | 3 +++
49 file3 | 4 ++++
50 - 3 files changed, 9 insertions(+), 0 deletions(-)
50 + 3 files changed, 9 insertions(+)
51 create mode 100644 file3
52
53 diff --git a/dir/sub b/dir/sub
@@ -89,7 +89,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
89 ---
90 dir/sub | 2 ++
91 file1 | 3 +++
92 - 2 files changed, 5 insertions(+), 0 deletions(-)
92 + 2 files changed, 5 insertions(+)
93 create mode 100644 file1
94
95 diff --git a/dir/sub b/dir/sub
@@ -165,7 +165,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
165 dir/sub | 2 ++
166 file0 | 3 +++
167 file2 | 3 +++
168 - 3 files changed, 8 insertions(+), 0 deletions(-)
168 + 3 files changed, 8 insertions(+)
169 create mode 100644 dir/sub
170 create mode 100644 file0
171 create mode 100644 file2
t/t4013/diff.show_--patch-with-stat_--summary_side
+1 -1
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12 create mode 100644 file3
13
14 diff --git a/dir/sub b/dir/sub
t/t4013/diff.show_--patch-with-stat_side
+1 -1
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12
13 diff --git a/dir/sub b/dir/sub
14 index 35d242b..7289e35 100644
t/t4013/diff.show_--stat_--summary_side
+1 -1
@@ -8,6 +8,6 @@ Date: Mon Jun 26 00:03:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12 create mode 100644 file3
13 $
t/t4013/diff.show_--stat_side
+1 -1
@@ -8,5 +8,5 @@ Date: Mon Jun 26 00:03:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12 $
t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
+3 -3
@@ -6,7 +6,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
6 Side
7 ---
8 dir/sub | 2 ++
9 - 1 files changed, 2 insertions(+), 0 deletions(-)
9 + 1 file changed, 2 insertions(+)
10
11 diff --git a/dir/sub b/dir/sub
12 index 35d242b..7289e35 100644
@@ -25,7 +25,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
25 Third
26 ---
27 dir/sub | 2 ++
28 - 1 files changed, 2 insertions(+), 0 deletions(-)
28 + 1 file changed, 2 insertions(+)
29
30 diff --git a/dir/sub b/dir/sub
31 index 8422d40..cead32e 100644
@@ -47,7 +47,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
47 This is the second commit.
48 ---
49 dir/sub | 2 ++
50 - 1 files changed, 2 insertions(+), 0 deletions(-)
50 + 1 file changed, 2 insertions(+)
51
52 diff --git a/dir/sub b/dir/sub
53 index 35d242b..8422d40 100644
t/t4013/diff.whatchanged_--patch-with-stat_master
+2 -2
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12
13 diff --git a/dir/sub b/dir/sub
14 index 35d242b..7289e35 100644
@@ -49,7 +49,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
49 ---
50 dir/sub | 2 ++
51 file1 | 3 +++
52 - 2 files changed, 5 insertions(+), 0 deletions(-)
52 + 2 files changed, 5 insertions(+)
53
54 diff --git a/dir/sub b/dir/sub
55 index 8422d40..cead32e 100644
t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
+3 -3
@@ -6,7 +6,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
6 Side
7 ---
8 dir/sub | 2 ++
9 - 1 files changed, 2 insertions(+), 0 deletions(-)
9 + 1 file changed, 2 insertions(+)
10
11 diff --git a/dir/sub b/dir/sub
12 index 35d242b..7289e35 100644
@@ -25,7 +25,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
25 Third
26 ---
27 dir/sub | 2 ++
28 - 1 files changed, 2 insertions(+), 0 deletions(-)
28 + 1 file changed, 2 insertions(+)
29
30 diff --git a/dir/sub b/dir/sub
31 index 8422d40..cead32e 100644
@@ -47,7 +47,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
47 This is the second commit.
48 ---
49 dir/sub | 2 ++
50 - 1 files changed, 2 insertions(+), 0 deletions(-)
50 + 1 file changed, 2 insertions(+)
51
52 diff --git a/dir/sub b/dir/sub
53 index 35d242b..8422d40 100644
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
+4 -4
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000
8
9 dir/sub | 2 ++
10 file0 | 3 +++
11 - 2 files changed, 5 insertions(+), 0 deletions(-)
11 + 2 files changed, 5 insertions(+)
12
13 diff --cc dir/sub
14 index cead32e,7289e35..992913c
@@ -47,7 +47,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
47 dir/sub | 2 ++
48 file0 | 3 +++
49 file3 | 4 ++++
50 - 3 files changed, 9 insertions(+), 0 deletions(-)
50 + 3 files changed, 9 insertions(+)
51 create mode 100644 file3
52
53 diff --git a/dir/sub b/dir/sub
@@ -89,7 +89,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
89 ---
90 dir/sub | 2 ++
91 file1 | 3 +++
92 - 2 files changed, 5 insertions(+), 0 deletions(-)
92 + 2 files changed, 5 insertions(+)
93 create mode 100644 file1
94
95 diff --git a/dir/sub b/dir/sub
@@ -165,7 +165,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
165 dir/sub | 2 ++
166 file0 | 3 +++
167 file2 | 3 +++
168 - 3 files changed, 8 insertions(+), 0 deletions(-)
168 + 3 files changed, 8 insertions(+)
169 create mode 100644 dir/sub
170 create mode 100644 file0
171 create mode 100644 file2
t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
+3 -3
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12 create mode 100644 file3
13
14 diff --git a/dir/sub b/dir/sub
@@ -50,7 +50,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
50 ---
51 dir/sub | 2 ++
52 file1 | 3 +++
53 - 2 files changed, 5 insertions(+), 0 deletions(-)
53 + 2 files changed, 5 insertions(+)
54 create mode 100644 file1
55
56 diff --git a/dir/sub b/dir/sub
@@ -126,7 +126,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
126 dir/sub | 2 ++
127 file0 | 3 +++
128 file2 | 3 +++
129 - 3 files changed, 8 insertions(+), 0 deletions(-)
129 + 3 files changed, 8 insertions(+)
130 create mode 100644 dir/sub
131 create mode 100644 file0
132 create mode 100644 file2
t/t4013/diff.whatchanged_--root_--patch-with-stat_master
+3 -3
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 - 3 files changed, 9 insertions(+), 0 deletions(-)
11 + 3 files changed, 9 insertions(+)
12
13 diff --git a/dir/sub b/dir/sub
14 index 35d242b..7289e35 100644
@@ -49,7 +49,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
49 ---
50 dir/sub | 2 ++
51 file1 | 3 +++
52 - 2 files changed, 5 insertions(+), 0 deletions(-)
52 + 2 files changed, 5 insertions(+)
53
54 diff --git a/dir/sub b/dir/sub
55 index 8422d40..cead32e 100644
@@ -123,7 +123,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
123 dir/sub | 2 ++
124 file0 | 3 +++
125 file2 | 3 +++
126 - 3 files changed, 8 insertions(+), 0 deletions(-)
126 + 3 files changed, 8 insertions(+)
127
128 diff --git a/dir/sub b/dir/sub
129 new file mode 100644
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+4 -4
@@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000
8
9 dir/sub | 2 ++
10 file0 | 3 +++
11 - 2 files changed, 5 insertions(+), 0 deletions(-)
11 + 2 files changed, 5 insertions(+)
12
13 diff --combined dir/sub
14 index cead32e,7289e35..992913c
@@ -47,7 +47,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
47 dir/sub | 2 ++
48 file0 | 3 +++
49 file3 | 4 ++++
50 - 3 files changed, 9 insertions(+), 0 deletions(-)
50 + 3 files changed, 9 insertions(+)
51 create mode 100644 file3
52
53 diff --git a/dir/sub b/dir/sub
@@ -89,7 +89,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
89 ---
90 dir/sub | 2 ++
91 file1 | 3 +++
92 - 2 files changed, 5 insertions(+), 0 deletions(-)
92 + 2 files changed, 5 insertions(+)
93 create mode 100644 file1
94
95 diff --git a/dir/sub b/dir/sub
@@ -165,7 +165,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
165 dir/sub | 2 ++
166 file0 | 3 +++
167 file2 | 3 +++
168 - 3 files changed, 8 insertions(+), 0 deletions(-)
168 + 3 files changed, 8 insertions(+)
169 create mode 100644 dir/sub
170 create mode 100644 file0
171 create mode 100644 file2
t/t4014-format-patch.sh
+1 -1
@@ -520,7 +520,7 @@ test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
520 cat > expect << EOF
521 ---
522 file | 16 ++++++++++++++++
523 - 1 files changed, 16 insertions(+), 0 deletions(-)
523 + 1 file changed, 16 insertions(+)
524
525 diff --git a/file b/file
526 index 40f36c6..2dc5c23 100644
t/t4030-diff-textconv.sh
+1 -1
@@ -86,7 +86,7 @@ test_expect_success 'status -v produces text' '
86
87 cat >expect.stat <<'EOF'
88 file | Bin 2 -> 4 bytes
89 - 1 files changed, 0 insertions(+), 0 deletions(-)
89 + 1 file changed, 0 insertions(+), 0 deletions(-)
90 EOF
91 test_expect_success 'diffstat does not run textconv' '
92 echo file diff=fail >.gitattributes &&
t/t4045-diff-relative.sh
+1 -1
@@ -33,7 +33,7 @@ check_stat() {
33 expect=$1; shift
34 cat >expected <<EOF
35 $expect | 1 +
36 - 1 files changed, 1 insertions(+), 0 deletions(-)
36 + 1 file changed, 1 insertion(+)
37 EOF
38 test_expect_success "--stat $*" "
39 git diff --stat $* HEAD^ >actual &&
t/t4049-diff-stat-count.sh
+1 -1
@@ -16,7 +16,7 @@ test_expect_success setup '
16 cat >expect <<-\EOF
17 a | 1 +
18 b | 1 +
19 - 2 files changed, 2 insertions(+), 0 deletions(-)
19 + 2 files changed, 2 insertions(+)
20 EOF
21 git diff --stat --stat-count=2 >actual &&
22 test_cmp expect actual
t/t4100/t-apply-8.expect
+1 -1
@@ -1,2 +1,2 @@
1 t/t4100-apply-stat.sh | 2 +-
2 - 1 files changed, 1 insertions(+), 1 deletions(-)
2 + 1 file changed, 1 insertion(+), 1 deletion(-)
t/t4100/t-apply-9.expect
+1 -1
@@ -1,2 +1,2 @@
1 t/t4100-apply-stat.sh | 2 +-
2 - 1 files changed, 1 insertions(+), 1 deletions(-)
2 + 1 file changed, 1 insertion(+), 1 deletion(-)
t/t5150-request-pull.sh
+1 -1
@@ -95,7 +95,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '
95 b
96 : diffstat
97 n
98 - / [0-9]* files changed/ {
98 + / [0-9]* files* changed/ {
99 a\\
100 DIFFSTAT
101 b
t/t7602-merge-octopus-many.sh
+3 -3
@@ -57,7 +57,7 @@ Merge made by the 'octopus' strategy.
57 c2.c | 1 +
58 c3.c | 1 +
59 c4.c | 1 +
60 - 3 files changed, 3 insertions(+), 0 deletions(-)
60 + 3 files changed, 3 insertions(+)
61 create mode 100644 c2.c
62 create mode 100644 c3.c
63 create mode 100644 c4.c
@@ -74,7 +74,7 @@ Already up-to-date with c4
74 Trying simple merge with c5
75 Merge made by the 'octopus' strategy.
76 c5.c | 1 +
77 - 1 files changed, 1 insertions(+), 0 deletions(-)
77 + 1 file changed, 1 insertion(+)
78 create mode 100644 c5.c
79 EOF
80
@@ -89,7 +89,7 @@ Trying simple merge with c2
89 Merge made by the 'octopus' strategy.
90 c1.c | 1 +
91 c2.c | 1 +
92 - 2 files changed, 2 insertions(+), 0 deletions(-)
92 + 2 files changed, 2 insertions(+)
93 create mode 100644 c1.c
94 create mode 100644 c2.c
95 EOF