{"thread":{"id":"30371","subject":"[PATCH resend] diff --stat: use less columns for change counts","startedAt":"2012-04-30T20:38:58Z","lastAt":"2012-05-01T15:24:49Z","messageCount":3,"participants":["Zbigniew Jędrzejewski-Szmek","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"190342","messageId":"1335818338-3657-1-git-send-email-zbyszek@in.waw.pl","threadId":"30371","inReplyTo":null,"subject":"[PATCH resend] diff --stat: use less columns for change counts","fromName":"Zbigniew Jędrzejewski-Szmek","fromEmail":"zbyszek@in.waw.pl","sentAt":"2012-04-30T20:38:58Z","receivedAt":"2012-04-30T20:38:58Z","isPatch":true,"sender":{"key":"zbyszek@in.waw.pl","avatar":"https://avatars.githubusercontent.com/u/349618?v=4"},"body":"Number of columns required for change counts is now computed based on\nthe maximum number of changed lines instead of being fixed. This means\nthat usually a few more columns will be available for the filenames\nand the graph.\n\nThe graph width logic is also modified to include enough space for\n\"Bin XXX -> YYY bytes\".\n\nIf changes to binary files are mixed with changes to text files,\nchange counts are padded to take at least three columns. And the other\nway around, if change counts require more than three columns, then\n\"Bin\"s are padded to align with the change count. This way, the +-\npart starts in the same column as \"XXX -> YYY\" part for binary files.\nThis makes the graph easier to parse visually thanks to the empty\ncolumn. This mimics the layout of diff --stat before this change.\n\nTests and the tutorial are updated to reflect the new --stat output.\nThis means either the removal of extra padding and/or the addition of\nup to three extra characters to truncated filenames. One test is added\nto check the graph alignment when a binary file change and text file\nchange of more than 999 lines are committed together.\n\nSigned-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>\n---\nHi,\n\nthis is a patch that was first proposed as the last part of a series,\nmerged in af05021 \"Merge branch 'zj/diff-stat-dyncol'\" 2012-03-06,\nbut without this patch. The problem with this patch was the large\nnumber of tests that needed to be adapted.\n\nAfter merging, Junio suggested to \"later consider if rerolling the\npatch is worth it after the dust settles\" [1]. Since 1.7.10 is\nreleased, here is another try. I still think that this would be a\nbeneficial change. One sample is the diffstat below, generated without\nand with this patch.\n\nDuy suggested to use the new strategy only when output would use more\nthan 80 columns [2]. Doing so would have the advantage that the tests\nwould be mostly untouched. But doing this would make the code slightly\nmore complicated. Also, Jonathan Nieder's patches to use --numstat\ninstead of --stat (2983c0e \"test: use numstat instead of diffstat in\nbinary-diff test\" 2012-03-13) removed some of the places that needed\nto be adapted. So I think it's better to just modify the test output.\n\nThis resend applies and tests cleanly against both current next and pu.\n\n[1] http://article.gmane.org/gmane.comp.version-control.git/190903\n[2] http://article.gmane.org/gmane.comp.version-control.git/190827\n\nold diff-stat:\n Documentation/gitcore-tutorial.txt                 |    4 +-\n diff.c                                             |   48 ++++++++++++++++----\n t/t0023-crlf-am.sh                                 |    2 +-\n t/t1200-tutorial.sh                                |    4 +-\n t/t3404-rebase-interactive.sh                      |    2 +-\n t/t3903-stash.sh                                   |    2 +-\n t/t4012-diff-binary.sh                             |   19 ++++++++\n ...\n\nnew diff-stat:\n Documentation/gitcore-tutorial.txt                 |  4 +-\n diff.c                                             | 48 +++++++++++++++++-----\n t/t0023-crlf-am.sh                                 |  2 +-\n t/t1200-tutorial.sh                                |  4 +-\n t/t3404-rebase-interactive.sh                      |  2 +-\n t/t3903-stash.sh                                   |  2 +-\n t/t4012-diff-binary.sh                             | 19 +++++++++\n ...ff-tree_--cc_--patch-with-stat_--summary_master |  4 +-\n ...diff-tree_--cc_--patch-with-stat_--summary_side |  6 +--\n .../diff.diff-tree_--cc_--patch-with-stat_master   |  4 +-\n .../diff.diff-tree_--cc_--stat_--summary_master    |  4 +-\n t/t4013/diff.diff-tree_--cc_--stat_--summary_side  |  6 +--\n t/t4013/diff.diff-tree_--cc_--stat_master          |  4 +-\n ...pretty=oneline_--root_--patch-with-stat_initial |  6 +--\n .../diff.diff-tree_--pretty_--patch-with-stat_side |  6 +--\n ...-tree_--pretty_--root_--patch-with-stat_initial |  6 +--\n ...f-tree_--pretty_--root_--stat_--summary_initial |  6 +--\n .../diff.diff-tree_--pretty_--root_--stat_initial  |  6 +--\n ...diff.diff-tree_--root_--patch-with-stat_initial |  6 +--\n t/t4013/diff.diff-tree_-c_--stat_--summary_master  |  4 +-\n t/t4013/diff.diff-tree_-c_--stat_--summary_side    |  6 +--\n t/t4013/diff.diff-tree_-c_--stat_master            |  4 +-\n .../diff.diff_--patch-with-stat_-r_initial..side   |  6 +--\n t/t4013/diff.diff_--patch-with-stat_initial..side  |  6 +--\n t/t4013/diff.diff_--stat_initial..side             |  6 +--\n t/t4013/diff.diff_-r_--stat_initial..side          |  6 +--\n ..._--attach_--stdout_--suffix=.diff_initial..side |  6 +--\n ....format-patch_--attach_--stdout_initial..master | 16 ++++----\n ...format-patch_--attach_--stdout_initial..master^ | 10 ++---\n ...ff.format-patch_--attach_--stdout_initial..side |  6 +--\n ...nline_--stdout_--numbered-files_initial..master | 16 ++++----\n ...tdout_--subject-prefix=TESTCASE_initial..master | 16 ++++----\n ....format-patch_--inline_--stdout_initial..master | 16 ++++----\n ...format-patch_--inline_--stdout_initial..master^ | 10 ++---\n ...ormat-patch_--inline_--stdout_initial..master^^ |  6 +--\n ...ff.format-patch_--inline_--stdout_initial..side |  6 +--\n ...tch_--stdout_--cover-letter_-n_initial..master^ | 18 ++++----\n ...at-patch_--stdout_--no-numbered_initial..master | 16 ++++----\n ...ormat-patch_--stdout_--numbered_initial..master | 16 ++++----\n t/t4013/diff.format-patch_--stdout_initial..master | 16 ++++----\n .../diff.format-patch_--stdout_initial..master^    | 10 ++---\n t/t4013/diff.format-patch_--stdout_initial..side   |  6 +--\n ....log_--patch-with-stat_--summary_master_--_dir_ |  6 +--\n t/t4013/diff.log_--patch-with-stat_master          | 16 ++++----\n t/t4013/diff.log_--patch-with-stat_master_--_dir_  |  6 +--\n ..._--root_--cc_--patch-with-stat_--summary_master | 26 ++++++------\n ...f.log_--root_--patch-with-stat_--summary_master | 22 +++++-----\n t/t4013/diff.log_--root_--patch-with-stat_master   | 22 +++++-----\n ...og_--root_-c_--patch-with-stat_--summary_master | 26 ++++++------\n t/t4013/diff.show_--patch-with-stat_--summary_side |  6 +--\n t/t4013/diff.show_--patch-with-stat_side           |  6 +--\n t/t4013/diff.show_--stat_--summary_side            |  6 +--\n t/t4013/diff.show_--stat_side                      |  6 +--\n ...nged_--patch-with-stat_--summary_master_--_dir_ |  6 +--\n t/t4013/diff.whatchanged_--patch-with-stat_master  | 16 ++++----\n ...ff.whatchanged_--patch-with-stat_master_--_dir_ |  6 +--\n ..._--root_--cc_--patch-with-stat_--summary_master | 26 ++++++------\n ...anged_--root_--patch-with-stat_--summary_master | 22 +++++-----\n ...iff.whatchanged_--root_--patch-with-stat_master | 22 +++++-----\n ...ed_--root_-c_--patch-with-stat_--summary_master | 26 ++++++------\n t/t4016-diff-quote.sh                              | 14 +++----\n t/t4030-diff-textconv.sh                           |  2 +-\n t/t4045-diff-relative.sh                           |  2 +-\n t/t4049-diff-stat-count.sh                         |  4 +-\n t/t4052-stat-output.sh                             |  6 +--\n t/t4202-log.sh                                     | 30 +++++++-------\n t/t5100/patch0001                                  |  2 +-\n t/t5100/patch0002                                  |  2 +-\n t/t5100/patch0003                                  |  2 +-\n t/t5100/patch0005                                  |  4 +-\n t/t5100/patch0006                                  |  2 +-\n t/t5100/patch0010                                  |  2 +-\n t/t5100/patch0011                                  |  2 +-\n t/t5100/patch0014                                  |  2 +-\n t/t5100/patch0014--scissors                        |  2 +-\n t/t5100/sample.mbox                                | 18 ++++----\n t/t7602-merge-octopus-many.sh                      | 12 +++---\n 77 files changed, 400 insertions(+), 353 deletions(-)\n\ndiff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt\nindex f5074a8..9d89336 100644\n--- a/Documentation/gitcore-tutorial.txt\n+++ b/Documentation/gitcore-tutorial.txt\n@@ -1002,8 +1002,8 @@ would be different)\n ----------------\n Updating from ae3a2da... to a80b4aa....\n Fast-forward (no commit created; -m option ignored)\n- example |    1 +\n- hello   |    1 +\n+ example | 1 +\n+ hello   | 1 +\n  2 files changed, 2 insertions(+)\n ----------------\n \ndiff --git a/diff.c b/diff.c\nindex 7da16c9..02081d2 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -1443,8 +1443,8 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n {\n \tint i, len, add, del, adds = 0, dels = 0;\n \tuintmax_t max_change = 0, max_len = 0;\n-\tint total_files = data->nr;\n-\tint width, name_width, graph_width, number_width = 4, count;\n+\tint total_files = data->nr, count;\n+\tint width, name_width, graph_width, number_width = 0, bin_width = 0;\n \tconst char *reset, *add_c, *del_c;\n \tconst char *line_prefix = \"\";\n \tint extra_shown = 0;\n@@ -1480,8 +1480,21 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t\tif (max_len < len)\n \t\t\tmax_len = len;\n \n-\t\tif (file->is_binary || file->is_unmerged)\n+\t\tif (file->is_unmerged) {\n+\t\t\t/* \"Unmerged\" is 8 characters */\n+\t\t\tbin_width = bin_width < 8 ? 8 : bin_width;\n \t\t\tcontinue;\n+\t\t}\n+\t\tif (file->is_binary) {\n+\t\t\t/* \"Bin XXX -> YYY bytes\" */\n+\t\t\tint w = 14 + decimal_width(file->added)\n+\t\t\t\t+ decimal_width(file->deleted);\n+\t\t\tbin_width = bin_width < w ? w : bin_width;\n+\t\t\t/* Display change counts aligned with \"Bin\" */\n+\t\t\tnumber_width = 3;\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tif (max_change < change)\n \t\t\tmax_change = change;\n \t}\n@@ -1506,12 +1519,22 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t * stat_name_width fixes the maximum width of the filename,\n \t * and is also used to divide available columns if there\n \t * aren't enough.\n+\t *\n+\t * Binary files are displayed with \"Bin XXX -> YYY bytes\"\n+\t * instead of the change count and graph. This part is treated\n+\t * similarly to the graph part, except that it is not\n+\t * \"scaled\". If total width is too small to accomodate the\n+\t * guaranteed minimum width of the filename part and the\n+\t * separators and this message, this message will \"overflow\"\n+\t * making the line longer than the maximum width.\n \t */\n \n \tif (options->stat_width == -1)\n \t\twidth = term_columns() - options->output_prefix_length;\n \telse\n \t\twidth = options->stat_width ? options->stat_width : 80;\n+\tnumber_width = decimal_width(max_change) > number_width ?\n+\t\tdecimal_width(max_change) : number_width;\n \n \tif (options->stat_graph_width == -1)\n \t\toptions->stat_graph_width = diff_stat_graph_width;\n@@ -1525,10 +1548,14 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \n \t/*\n \t * First assign sizes that are wanted, ignoring available width.\n+\t * strlen(\"Bin XXX -> YYY bytes\") == bin_width, and the part\n+\t * starting from \"XXX\" should fit in graph_width.\n \t */\n-\tgraph_width = (options->stat_graph_width &&\n-\t\t       options->stat_graph_width < max_change) ?\n-\t\toptions->stat_graph_width : max_change;\n+\tgraph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;\n+\tif (options->stat_graph_width &&\n+\t    options->stat_graph_width < graph_width)\n+\t\tgraph_width = options->stat_graph_width;\n+\n \tname_width = (options->stat_name_width > 0 &&\n \t\t      options->stat_name_width < max_len) ?\n \t\toptions->stat_name_width : max_len;\n@@ -1587,7 +1614,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t\tif (data->files[i]->is_binary) {\n \t\t\tfprintf(options->file, \"%s\", line_prefix);\n \t\t\tshow_name(options->file, prefix, name, len);\n-\t\t\tfprintf(options->file, \"  Bin \");\n+\t\t\tfprintf(options->file, \" %*s \", number_width, \"Bin\");\n \t\t\tfprintf(options->file, \"%s%\"PRIuMAX\"%s\",\n \t\t\t\tdel_c, deleted, reset);\n \t\t\tfprintf(options->file, \" -> \");\n@@ -1600,7 +1627,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t\telse if (data->files[i]->is_unmerged) {\n \t\t\tfprintf(options->file, \"%s\", line_prefix);\n \t\t\tshow_name(options->file, prefix, name, len);\n-\t\t\tfprintf(options->file, \"  Unmerged\\n\");\n+\t\t\tfprintf(options->file, \" Unmerged\\n\");\n \t\t\tcontinue;\n \t\t}\n \n@@ -1629,8 +1656,9 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)\n \t\t}\n \t\tfprintf(options->file, \"%s\", line_prefix);\n \t\tshow_name(options->file, prefix, name, len);\n-\t\tfprintf(options->file, \"%5\"PRIuMAX\"%s\", added + deleted,\n-\t\t\t\tadded + deleted ? \" \" : \"\");\n+\t\tfprintf(options->file, \" %*\"PRIuMAX\"%s\",\n+\t\t\tnumber_width, added + deleted,\n+\t\t\tadded + deleted ? \" \" : \"\");\n \t\tshow_graph(options->file, '+', add, add_c, reset);\n \t\tshow_graph(options->file, '-', del, del_c, reset);\n \t\tfprintf(options->file, \"\\n\");\ndiff --git a/t/t0023-crlf-am.sh b/t/t0023-crlf-am.sh\nindex aaed725..f9bbb91 100755\n--- a/t/t0023-crlf-am.sh\n+++ b/t/t0023-crlf-am.sh\n@@ -11,7 +11,7 @@ Date: Thu, 23 Aug 2007 13:00:00 +0200\n Subject: test1\n \n ---\n- foo |    1 +\n+ foo | 1 +\n  1 files changed, 1 insertions(+), 0 deletions(-)\n  create mode 100644 foo\n \ndiff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh\nindex 9356bea..397ccb6 100755\n--- a/t/t1200-tutorial.sh\n+++ b/t/t1200-tutorial.sh\n@@ -154,8 +154,8 @@ test_expect_success 'git show-branch' '\n cat > resolve.expect << EOF\n Updating VARIABLE..VARIABLE\n FASTFORWARD (no commit created; -m option ignored)\n- example |    1 +\n- hello   |    1 +\n+ example | 1 +\n+ hello   | 1 +\n  2 files changed, 2 insertions(+)\n EOF\n \ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 7fd2127..4983bd7 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -323,7 +323,7 @@ test_expect_success 'verbose flag is heeded, even after --continue' '\n \techo resolved > file1 &&\n \tgit add file1 &&\n \tgit rebase --continue > output &&\n-\tgrep \"^ file1 |    2 +-$\" output\n+\tgrep \"^ file1 | 2 +-$\" output\n '\n \n test_expect_success 'multi-squash only fires up editor once' '\ndiff --git a/t/t3903-stash.sh b/t/t3903-stash.sh\nindex 3addb80..cd04263 100755\n--- a/t/t3903-stash.sh\n+++ b/t/t3903-stash.sh\n@@ -443,7 +443,7 @@ test_expect_success 'stash show format defaults to --stat' '\n \tSTASH_ID=$(git stash create) &&\n \tgit reset --hard &&\n \tcat >expected <<-EOF &&\n-\t file |    1 +\n+\t file | 1 +\n \t 1 file changed, 1 insertion(+)\n \tEOF\n \tgit stash show ${STASH_ID} >actual &&\ndiff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh\nindex ed24ddd..8b4e80d 100755\n--- a/t/t4012-diff-binary.sh\n+++ b/t/t4012-diff-binary.sh\n@@ -107,4 +107,23 @@ test_expect_success 'diff --no-index with binary creation' '\n \ttest_cmp expected actual\n '\n \n+cat >expect <<EOF\n+ binfile  |   Bin 0 -> 1026 bytes\n+ textfile | 10000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n+EOF\n+\n+test_expect_success 'diff --stat with binary files and big change count' '\n+\techo X | dd of=binfile bs=1k seek=1 &&\n+\tgit add binfile &&\n+\ti=0 &&\n+\twhile test $i -lt 10000; do\n+\t\techo $i &&\n+\t\ti=$(($i + 1))\n+\tdone >textfile &&\n+\tgit add textfile &&\n+\tgit diff --cached --stat binfile textfile >output &&\n+\tgrep \" | \" output >actual &&\n+\ttest_cmp expect actual\n+'\n+\n test_done\ndiff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master\nindex 2f8560c..9951e36 100644\n--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master\n@@ -1,7 +1,7 @@\n $ git diff-tree --cc --patch-with-stat --summary master\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --cc dir/sub\ndiff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side\nindex 72e03c1..cec33fa 100644\n--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side\n+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side\n@@ -1,8 +1,8 @@\n $ git diff-tree --cc --patch-with-stat --summary side\n c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master\nindex 8b357d9..db3c0a7 100644\n--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master\n+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master\n@@ -1,7 +1,7 @@\n $ git diff-tree --cc --patch-with-stat master\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --cc dir/sub\ndiff --git a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--stat_--summary_master\nindex e0568d6..d019867 100644\n--- a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master\n+++ b/t/t4013/diff.diff-tree_--cc_--stat_--summary_master\n@@ -1,6 +1,6 @@\n $ git diff-tree --cc --stat --summary master\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n $\ndiff --git a/t/t4013/diff.diff-tree_--cc_--stat_--summary_side b/t/t4013/diff.diff-tree_--cc_--stat_--summary_side\nindex 5afc823..12b2eee 100644\n--- a/t/t4013/diff.diff-tree_--cc_--stat_--summary_side\n+++ b/t/t4013/diff.diff-tree_--cc_--stat_--summary_side\n@@ -1,8 +1,8 @@\n $ git diff-tree --cc --stat --summary side\n c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n $\ndiff --git a/t/t4013/diff.diff-tree_--cc_--stat_master b/t/t4013/diff.diff-tree_--cc_--stat_master\nindex f48367a..40b9179 100644\n--- a/t/t4013/diff.diff-tree_--cc_--stat_master\n+++ b/t/t4013/diff.diff-tree_--cc_--stat_master\n@@ -1,6 +1,6 @@\n $ git diff-tree --cc --stat master\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n $\ndiff --git a/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial b/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial\nindex 590864c..817ed06 100644\n--- a/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial\n+++ b/t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial\n@@ -1,8 +1,8 @@\n $ git diff-tree --pretty=oneline --root --patch-with-stat initial\n 444ac553ac7612cc88969031b02b3767fb8a353a Initial\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side b/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side\nindex e05e778..fe3f6b7 100644\n--- a/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side\n+++ b/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial b/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial\nindex 0e2c956..06eb77e 100644\n--- a/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial\n+++ b/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial b/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial\nindex 384fa44..680eab5 100644\n--- a/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial\n+++ b/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n \n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n  create mode 100644 dir/sub\n  create mode 100644 file0\ndiff --git a/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial b/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial\nindex 10384a8..9722d1b 100644\n--- a/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial\n+++ b/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial\n@@ -5,8 +5,8 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n \n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n $\ndiff --git a/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial b/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial\nindex f57062e..ad69ffe 100644\n--- a/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial\n+++ b/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial\n@@ -1,8 +1,8 @@\n $ git diff-tree --root --patch-with-stat initial\n 444ac553ac7612cc88969031b02b3767fb8a353a\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.diff-tree_-c_--stat_--summary_master b/t/t4013/diff.diff-tree_-c_--stat_--summary_master\nindex 7088683..81c3021 100644\n--- a/t/t4013/diff.diff-tree_-c_--stat_--summary_master\n+++ b/t/t4013/diff.diff-tree_-c_--stat_--summary_master\n@@ -1,6 +1,6 @@\n $ git diff-tree -c --stat --summary master\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n $\ndiff --git a/t/t4013/diff.diff-tree_-c_--stat_--summary_side b/t/t4013/diff.diff-tree_-c_--stat_--summary_side\nindex ef216ab..e8dc12b 100644\n--- a/t/t4013/diff.diff-tree_-c_--stat_--summary_side\n+++ b/t/t4013/diff.diff-tree_-c_--stat_--summary_side\n@@ -1,8 +1,8 @@\n $ git diff-tree -c --stat --summary side\n c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n $\ndiff --git a/t/t4013/diff.diff-tree_-c_--stat_master b/t/t4013/diff.diff-tree_-c_--stat_master\nindex ad19f10..89d59b1 100644\n--- a/t/t4013/diff.diff-tree_-c_--stat_master\n+++ b/t/t4013/diff.diff-tree_-c_--stat_master\n@@ -1,6 +1,6 @@\n $ git diff-tree -c --stat master\n 59d314ad6f356dd08601a4cd5e530381da3e3c64\n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n $\ndiff --git a/t/t4013/diff.diff_--patch-with-stat_-r_initial..side b/t/t4013/diff.diff_--patch-with-stat_-r_initial..side\nindex ddad917..be8d1ea 100644\n--- a/t/t4013/diff.diff_--patch-with-stat_-r_initial..side\n+++ b/t/t4013/diff.diff_--patch-with-stat_-r_initial..side\n@@ -1,7 +1,7 @@\n $ git diff --patch-with-stat -r initial..side\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.diff_--patch-with-stat_initial..side b/t/t4013/diff.diff_--patch-with-stat_initial..side\nindex bdbd114..5424e6d 100644\n--- a/t/t4013/diff.diff_--patch-with-stat_initial..side\n+++ b/t/t4013/diff.diff_--patch-with-stat_initial..side\n@@ -1,7 +1,7 @@\n $ git diff --patch-with-stat initial..side\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.diff_--stat_initial..side b/t/t4013/diff.diff_--stat_initial..side\nindex 6d08f3d..b7741e2 100644\n--- a/t/t4013/diff.diff_--stat_initial..side\n+++ b/t/t4013/diff.diff_--stat_initial..side\n@@ -1,6 +1,6 @@\n $ git diff --stat initial..side\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n $\ndiff --git a/t/t4013/diff.diff_-r_--stat_initial..side b/t/t4013/diff.diff_-r_--stat_initial..side\nindex 2ddb254..5d514f5 100644\n--- a/t/t4013/diff.diff_-r_--stat_initial..side\n+++ b/t/t4013/diff.diff_-r_--stat_initial..side\n@@ -1,6 +1,6 @@\n $ git diff -r --stat initial..side\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n $\ndiff --git a/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side b/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side\nindex 3cab049..547ca06 100644\n--- a/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side\n+++ b/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side\n@@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master b/t/t4013/diff.format-patch_--attach_--stdout_initial..master\nindex 564a4d3..52fedc1 100644\n--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master\n+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master\n@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^\nindex 4f28460..1c3cde2 100644\n--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^\n+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^\n@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \ndiff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..side b/t/t4013/diff.format-patch_--attach_--stdout_initial..side\nindex b10cc2e..4717bd8 100644\n--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..side\n+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..side\n@@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master\nindex a976a8a..02c4db7 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master\n@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master\nindex b4fd664..c7677c5 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master\n@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_initial..master\nindex 0d31036..5b3e34e 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master\n@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^\nindex 18d4714..d13f8a8 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^\n@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^\nindex 29e00ab..caec553 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^\n@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \ndiff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..side b/t/t4013/diff.format-patch_--inline_--stdout_initial..side\nindex 3572f20..d3a6762 100644\n--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..side\n+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..side\n@@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed\n Content-Transfer-Encoding: 8bit\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^\nindex 54cdcda..244d964 100644\n--- a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^\n+++ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^\n@@ -10,10 +10,10 @@ A U Thor (2):\n   Second\n   Third\n \n- dir/sub |    4 ++++\n- file0   |    3 +++\n- file1   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 4 ++++\n+ file0   | 3 +++\n+ file1   | 3 +++\n+ file2   | 3 ---\n  4 files changed, 10 insertions(+), 3 deletions(-)\n  create mode 100644 file1\n  delete mode 100644 file2\n@@ -28,9 +28,9 @@ Subject: [DIFFERENT_PREFIX 1/2] Second\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -73,8 +73,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000\n Subject: [DIFFERENT_PREFIX 2/2] Third\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \ndiff --git a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master\nindex 23194eb..bfc287a 100644\n--- a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master\n+++ b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master\n@@ -6,9 +6,9 @@ Subject: [PATCH] Second\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000\n Subject: [PATCH] Third\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000\n Subject: [PATCH] Side\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--numbered_initial..master\nindex 78f1a80..568f6f5 100644\n--- a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master\n+++ b/t/t4013/diff.format-patch_--stdout_--numbered_initial..master\n@@ -6,9 +6,9 @@ Subject: [PATCH 1/3] Second\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000\n Subject: [PATCH 2/3] Third\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000\n Subject: [PATCH 3/3] Side\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--stdout_initial..master b/t/t4013/diff.format-patch_--stdout_initial..master\nindex a3dab7f..5f0352f 100644\n--- a/t/t4013/diff.format-patch_--stdout_initial..master\n+++ b/t/t4013/diff.format-patch_--stdout_initial..master\n@@ -6,9 +6,9 @@ Subject: [PATCH 1/3] Second\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000\n Subject: [PATCH 2/3] Third\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000\n Subject: [PATCH 3/3] Side\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..master^\nindex 39f4a3f..2ae454d 100644\n--- a/t/t4013/diff.format-patch_--stdout_initial..master^\n+++ b/t/t4013/diff.format-patch_--stdout_initial..master^\n@@ -6,9 +6,9 @@ Subject: [PATCH 1/2] Second\n \n This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000\n Subject: [PATCH 2/2] Third\n \n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \ndiff --git a/t/t4013/diff.format-patch_--stdout_initial..side b/t/t4013/diff.format-patch_--stdout_initial..side\nindex 8810920..a7d52fb 100644\n--- a/t/t4013/diff.format-patch_--stdout_initial..side\n+++ b/t/t4013/diff.format-patch_--stdout_initial..side\n@@ -5,9 +5,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000\n Subject: [PATCH] Side\n \n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_\nindex 4085bbd..a18f147 100644\n--- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_\n+++ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_\n@@ -12,7 +12,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -31,7 +31,7 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -53,7 +53,7 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_master\nindex 4586279..ae425c4 100644\n--- a/t/t4013/diff.log_--patch-with-stat_master\n+++ b/t/t4013/diff.log_--patch-with-stat_master\n@@ -12,9 +12,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -54,8 +54,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -86,9 +86,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_\nindex 6e172cf..d5207ca 100644\n--- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_\n+++ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_\n@@ -12,7 +12,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -31,7 +31,7 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -53,7 +53,7 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master\nindex 48b0d4b..0fc1e8c 100644\n--- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master\n@@ -6,8 +6,8 @@ Date:   Mon Jun 26 00:04:00 2006 +0000\n \n     Merge branch 'side'\n \n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --cc dir/sub\n@@ -44,9 +44,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \n@@ -87,8 +87,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -162,9 +162,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n  create mode 100644 dir/sub\n  create mode 100644 file0\ndiff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master\nindex f9dc512..dffc09d 100644\n--- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master\n@@ -12,9 +12,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \n@@ -55,8 +55,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -88,9 +88,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -130,9 +130,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n  create mode 100644 dir/sub\n  create mode 100644 file0\ndiff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_master\nindex 0807ece..55aa980 100644\n--- a/t/t4013/diff.log_--root_--patch-with-stat_master\n+++ b/t/t4013/diff.log_--root_--patch-with-stat_master\n@@ -12,9 +12,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -54,8 +54,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -86,9 +86,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n \n diff --git a/dir/sub b/dir/sub\n@@ -127,9 +127,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master\nindex 84f5ef6..019d85f 100644\n--- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master\n@@ -6,8 +6,8 @@ Date:   Mon Jun 26 00:04:00 2006 +0000\n \n     Merge branch 'side'\n \n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --combined dir/sub\n@@ -44,9 +44,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \n@@ -87,8 +87,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -162,9 +162,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n  create mode 100644 dir/sub\n  create mode 100644 file0\ndiff --git a/t/t4013/diff.show_--patch-with-stat_--summary_side b/t/t4013/diff.show_--patch-with-stat_--summary_side\nindex e60384d..95a474e 100644\n--- a/t/t4013/diff.show_--patch-with-stat_--summary_side\n+++ b/t/t4013/diff.show_--patch-with-stat_--summary_side\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \ndiff --git a/t/t4013/diff.show_--patch-with-stat_side b/t/t4013/diff.show_--patch-with-stat_side\nindex a3a3255..974e99b 100644\n--- a/t/t4013/diff.show_--patch-with-stat_side\n+++ b/t/t4013/diff.show_--patch-with-stat_side\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.show_--stat_--summary_side b/t/t4013/diff.show_--stat_--summary_side\nindex d16f464..a71492f 100644\n--- a/t/t4013/diff.show_--stat_--summary_side\n+++ b/t/t4013/diff.show_--stat_--summary_side\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n \n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n $\ndiff --git a/t/t4013/diff.show_--stat_side b/t/t4013/diff.show_--stat_side\nindex 6300c05..9be7124 100644\n--- a/t/t4013/diff.show_--stat_side\n+++ b/t/t4013/diff.show_--stat_side\n@@ -5,8 +5,8 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n \n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n $\ndiff --git a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_\nindex 16ae543..c8b6af2 100644\n--- a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_\n+++ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_\n@@ -5,7 +5,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -24,7 +24,7 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -46,7 +46,7 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master b/t/t4013/diff.whatchanged_--patch-with-stat_master\nindex f3e45ec..1ac431b 100644\n--- a/t/t4013/diff.whatchanged_--patch-with-stat_master\n+++ b/t/t4013/diff.whatchanged_--patch-with-stat_master\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -47,8 +47,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -79,9 +79,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_\nindex c77f0bc..b30c285 100644\n--- a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_\n+++ b/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_\n@@ -5,7 +5,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -24,7 +24,7 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -46,7 +46,7 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n+ dir/sub | 2 ++\n  1 file changed, 2 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master\nindex 8d03efe..30aae78 100644\n--- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master\n@@ -6,8 +6,8 @@ Date:   Mon Jun 26 00:04:00 2006 +0000\n \n     Merge branch 'side'\n \n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --cc dir/sub\n@@ -44,9 +44,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \n@@ -87,8 +87,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -162,9 +162,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n  create mode 100644 dir/sub\n  create mode 100644 file0\ndiff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master\nindex 1874d06..db90e51 100644\n--- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \n@@ -48,8 +48,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -81,9 +81,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -123,9 +123,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n  create mode 100644 dir/sub\n  create mode 100644 file0\ndiff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_master\nindex 5211ff2..9a6cc92 100644\n--- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master\n+++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_master\n@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -47,8 +47,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\n@@ -79,9 +79,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n \n diff --git a/dir/sub b/dir/sub\n@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n \n diff --git a/dir/sub b/dir/sub\ndiff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master\nindex ad30245..d1d32bd 100644\n--- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master\n+++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master\n@@ -6,8 +6,8 @@ Date:   Mon Jun 26 00:04:00 2006 +0000\n \n     Merge branch 'side'\n \n- dir/sub |    2 ++\n- file0   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n  2 files changed, 5 insertions(+)\n \n diff --combined dir/sub\n@@ -44,9 +44,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000\n \n     Side\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file3   |    4 ++++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file3   | 4 ++++\n  3 files changed, 9 insertions(+)\n  create mode 100644 file3\n \n@@ -87,8 +87,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000\n \n     Third\n ---\n- dir/sub |    2 ++\n- file1   |    3 +++\n+ dir/sub | 2 ++\n+ file1   | 3 +++\n  2 files changed, 5 insertions(+)\n  create mode 100644 file1\n \n@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000\n     \n     This is the second commit.\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 ---\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 ---\n  3 files changed, 5 insertions(+), 3 deletions(-)\n  delete mode 100644 file2\n \n@@ -162,9 +162,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000\n \n     Initial\n ---\n- dir/sub |    2 ++\n- file0   |    3 +++\n- file2   |    3 +++\n+ dir/sub | 2 ++\n+ file0   | 3 +++\n+ file2   | 3 +++\n  3 files changed, 8 insertions(+)\n  create mode 100644 dir/sub\n  create mode 100644 file0\ndiff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh\nindex 3ec7118..97b8177 100755\n--- a/t/t4016-diff-quote.sh\n+++ b/t/t4016-diff-quote.sh\n@@ -73,13 +73,13 @@ test_expect_success TABS_IN_FILENAMES 'git diff --numstat -M HEAD' '\n \n test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '\n \tcat >expect <<-\\EOF &&\n-\t pathname.1 => \"Rpathname\\twith HT.0\"            |    0\n-\t pathname.3 => \"Rpathname\\nwith LF.0\"            |    0\n-\t \"pathname\\twith HT.3\" => \"Rpathname\\nwith LF.1\" |    0\n-\t pathname.2 => Rpathname with SP.0               |    0\n-\t \"pathname\\twith HT.2\" => Rpathname with SP.1    |    0\n-\t pathname.0 => Rpathname.0                       |    0\n-\t \"pathname\\twith HT.0\" => Rpathname.1            |    0\n+\t pathname.1 => \"Rpathname\\twith HT.0\"            | 0\n+\t pathname.3 => \"Rpathname\\nwith LF.0\"            | 0\n+\t \"pathname\\twith HT.3\" => \"Rpathname\\nwith LF.1\" | 0\n+\t pathname.2 => Rpathname with SP.0               | 0\n+\t \"pathname\\twith HT.2\" => Rpathname with SP.1    | 0\n+\t pathname.0 => Rpathname.0                       | 0\n+\t \"pathname\\twith HT.0\" => Rpathname.1            | 0\n \t 7 files changed, 0 insertions(+), 0 deletions(-)\n \tEOF\n \tgit diff --stat -M HEAD >actual &&\ndiff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh\nindex 06b05df..d4ab4f2 100755\n--- a/t/t4030-diff-textconv.sh\n+++ b/t/t4030-diff-textconv.sh\n@@ -85,7 +85,7 @@ test_expect_success 'status -v produces text' '\n '\n \n cat >expect.stat <<'EOF'\n- file |  Bin 2 -> 4 bytes\n+ file | Bin 2 -> 4 bytes\n  1 file changed, 0 insertions(+), 0 deletions(-)\n EOF\n test_expect_success 'diffstat does not run textconv' '\ndiff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh\nindex 18fadcf..3950f50 100755\n--- a/t/t4045-diff-relative.sh\n+++ b/t/t4045-diff-relative.sh\n@@ -44,7 +44,7 @@ test_expect_success \"--numstat $*\" \"\n check_stat() {\n expect=$1; shift\n cat >expected <<EOF\n- $expect |    1 +\n+ $expect | 1 +\n  1 file changed, 1 insertion(+)\n EOF\n test_expect_success \"--stat $*\" \"\ndiff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh\nindex 591ffbc..b41eb61 100755\n--- a/t/t4049-diff-stat-count.sh\n+++ b/t/t4049-diff-stat-count.sh\n@@ -14,8 +14,8 @@ test_expect_success setup '\n \techo a >a &&\n \techo b >b &&\n \tcat >expect <<-\\EOF\n-\t a |    1 +\n-\t b |    1 +\n+\t a | 1 +\n+\t b | 1 +\n \t 2 files changed, 2 insertions(+)\n \tEOF\n \tgit diff --stat --stat-count=2 >actual &&\ndiff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh\nindex ddd9497..b68afef 100755\n--- a/t/t4052-stat-output.sh\n+++ b/t/t4052-stat-output.sh\n@@ -22,7 +22,7 @@ test_expect_success 'preparation' '\n while read cmd args\n do\n \tcat >expect <<-'EOF'\n-\t ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |    1 +\n+\t ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +\n \tEOF\n \ttest_expect_success \"$cmd: small change with long name gives more space to the name\" '\n \t\tgit $cmd $args >output &&\n@@ -31,7 +31,7 @@ do\n \t'\n \n \tcat >expect <<-'EOF'\n-\t ...aaaaaaaaaaaaaaaaaaaaaaaaaa |    1 +\n+\t ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +\n \tEOF\n \ttest_expect_success \"$cmd --stat=width: a long name is given more room when the bar is short\" '\n \t\tgit $cmd $args --stat=40 >output &&\n@@ -46,7 +46,7 @@ do\n \t'\n \n \tcat >expect <<-'EOF'\n-\t ...aaaaaaaaaaaaaaaaaaaaaaaaaaa |    1 +\n+\t ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +\n \tEOF\n \ttest_expect_success \"$cmd --stat=...,name-width with long name\" '\n \t\tgit $cmd $args --stat=60,30 >output &&\ndiff --git a/t/t4202-log.sh b/t/t4202-log.sh\nindex 32cf0bd..71be59d 100755\n--- a/t/t4202-log.sh\n+++ b/t/t4202-log.sh\n@@ -528,7 +528,7 @@ cat >expect <<\\EOF\n | |\n | |     reach\n | | ---\n-| |  reach.t |    1 +\n+| |  reach.t | 1 +\n | |  1 file changed, 1 insertion(+)\n | |\n | | diff --git a/reach.t b/reach.t\n@@ -551,7 +551,7 @@ cat >expect <<\\EOF\n | | |\n | | |       octopus-b\n | | |   ---\n-| | |    octopus-b.t |    1 +\n+| | |    octopus-b.t | 1 +\n | | |    1 file changed, 1 insertion(+)\n | | |\n | | |   diff --git a/octopus-b.t b/octopus-b.t\n@@ -567,7 +567,7 @@ cat >expect <<\\EOF\n | |\n | |       octopus-a\n | |   ---\n-| |    octopus-a.t |    1 +\n+| |    octopus-a.t | 1 +\n | |    1 file changed, 1 insertion(+)\n | |\n | |   diff --git a/octopus-a.t b/octopus-a.t\n@@ -583,7 +583,7 @@ cat >expect <<\\EOF\n |\n |       seventh\n |   ---\n-|    seventh.t |    1 +\n+|    seventh.t | 1 +\n |    1 file changed, 1 insertion(+)\n |\n |   diff --git a/seventh.t b/seventh.t\n@@ -617,7 +617,7 @@ cat >expect <<\\EOF\n | | | |\n | | | |     tangle-a\n | | | | ---\n-| | | |  tangle-a |    1 +\n+| | | |  tangle-a | 1 +\n | | | |  1 file changed, 1 insertion(+)\n | | | |\n | | | | diff --git a/tangle-a b/tangle-a\n@@ -639,7 +639,7 @@ cat >expect <<\\EOF\n | |/| |\n | | | |       side-2\n | | | |   ---\n-| | | |    2 |    1 +\n+| | | |    2 | 1 +\n | | | |    1 file changed, 1 insertion(+)\n | | | |\n | | | |   diff --git a/2 b/2\n@@ -655,7 +655,7 @@ cat >expect <<\\EOF\n | | | |\n | | | |     side-1\n | | | | ---\n-| | | |  1 |    1 +\n+| | | |  1 | 1 +\n | | | |  1 file changed, 1 insertion(+)\n | | | |\n | | | | diff --git a/1 b/1\n@@ -671,7 +671,7 @@ cat >expect <<\\EOF\n | | | |\n | | | |     Second\n | | | | ---\n-| | | |  one |    1 +\n+| | | |  one | 1 +\n | | | |  1 file changed, 1 insertion(+)\n | | | |\n | | | | diff --git a/one b/one\n@@ -687,7 +687,7 @@ cat >expect <<\\EOF\n |/| |\n | | |       sixth\n | | |   ---\n-| | |    a/two |    1 -\n+| | |    a/two | 1 -\n | | |    1 file changed, 1 deletion(-)\n | | |\n | | |   diff --git a/a/two b/a/two\n@@ -703,7 +703,7 @@ cat >expect <<\\EOF\n | | |\n | | |     fifth\n | | | ---\n-| | |  a/two |    1 +\n+| | |  a/two | 1 +\n | | |  1 file changed, 1 insertion(+)\n | | |\n | | | diff --git a/a/two b/a/two\n@@ -719,7 +719,7 @@ cat >expect <<\\EOF\n | |\n | |       fourth\n | |   ---\n-| |    ein |    1 +\n+| |    ein | 1 +\n | |    1 file changed, 1 insertion(+)\n | |\n | |   diff --git a/ein b/ein\n@@ -735,8 +735,8 @@ cat >expect <<\\EOF\n |\n |       third\n |   ---\n-|    ichi |    1 +\n-|    one  |    1 -\n+|    ichi | 1 +\n+|    one  | 1 -\n |    2 files changed, 1 insertion(+), 1 deletion(-)\n |\n |   diff --git a/ichi b/ichi\n@@ -759,7 +759,7 @@ cat >expect <<\\EOF\n |\n |     second\n | ---\n-|  one |    2 +-\n+|  one | 2 +-\n |  1 file changed, 1 insertion(+), 1 deletion(-)\n |\n | diff --git a/one b/one\n@@ -775,7 +775,7 @@ cat >expect <<\\EOF\n \n       initial\n   ---\n-   one |    1 +\n+   one | 1 +\n    1 file changed, 1 insertion(+)\n \n   diff --git a/one b/one\ndiff --git a/t/t5100/patch0001 b/t/t5100/patch0001\nindex 8ce1551..02c9774 100644\n--- a/t/t5100/patch0001\n+++ b/t/t5100/patch0001\n@@ -1,5 +1,5 @@\n ---\n- foo |    2 +-\n+ foo | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/foo b/foo\ndiff --git a/t/t5100/patch0002 b/t/t5100/patch0002\nindex 8ce1551..02c9774 100644\n--- a/t/t5100/patch0002\n+++ b/t/t5100/patch0002\n@@ -1,5 +1,5 @@\n ---\n- foo |    2 +-\n+ foo | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/foo b/foo\ndiff --git a/t/t5100/patch0003 b/t/t5100/patch0003\nindex 8ce1551..02c9774 100644\n--- a/t/t5100/patch0003\n+++ b/t/t5100/patch0003\n@@ -1,5 +1,5 @@\n ---\n- foo |    2 +-\n+ foo | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/foo b/foo\ndiff --git a/t/t5100/patch0005 b/t/t5100/patch0005\nindex 7d24b24..ab7a383 100644\n--- a/t/t5100/patch0005\n+++ b/t/t5100/patch0005\n@@ -1,7 +1,7 @@\n ---\n \n- Documentation/git-cvsimport-script.txt |    9 ++++++++-\n- git-cvsimport-script                   |    4 ++--\n+ Documentation/git-cvsimport-script.txt | 9 ++++++++-\n+ git-cvsimport-script                   | 4 ++--\n  2 files changed, 10 insertions(+), 3 deletions(-)\n \n 50452f9c0c2df1f04d83a26266ba704b13861632\ndiff --git a/t/t5100/patch0006 b/t/t5100/patch0006\nindex 8ce1551..02c9774 100644\n--- a/t/t5100/patch0006\n+++ b/t/t5100/patch0006\n@@ -1,5 +1,5 @@\n ---\n- foo |    2 +-\n+ foo | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/foo b/foo\ndiff --git a/t/t5100/patch0010 b/t/t5100/patch0010\nindex f055481..436821c 100644\n--- a/t/t5100/patch0010\n+++ b/t/t5100/patch0010\n@@ -1,5 +1,5 @@\n ---\n- builtin-mailinfo.c |    2 +-\n+ builtin-mailinfo.c | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\ndiff --git a/t/t5100/patch0011 b/t/t5100/patch0011\nindex 8841d3c..0988713 100644\n--- a/t/t5100/patch0011\n+++ b/t/t5100/patch0011\n@@ -1,5 +1,5 @@\n ---\n- builtin-mailinfo.c  |    4 ++--\n+ builtin-mailinfo.c  | 4 ++--\n \n diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\n index 3e5fe51..aabfe5c 100644\ndiff --git a/t/t5100/patch0014 b/t/t5100/patch0014\nindex 124efd2..3f3825f 100644\n--- a/t/t5100/patch0014\n+++ b/t/t5100/patch0014\n@@ -1,5 +1,5 @@\n ---\n- builtin-mailinfo.c |   37 ++++++++++++++++++++++++++++++++++++-\n+ builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-\n  1 files changed, 36 insertions(+), 1 deletions(-)\n \n diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\ndiff --git a/t/t5100/patch0014--scissors b/t/t5100/patch0014--scissors\nindex 124efd2..3f3825f 100644\n--- a/t/t5100/patch0014--scissors\n+++ b/t/t5100/patch0014--scissors\n@@ -1,5 +1,5 @@\n ---\n- builtin-mailinfo.c |   37 ++++++++++++++++++++++++++++++++++++-\n+ builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-\n  1 files changed, 36 insertions(+), 1 deletions(-)\n \n diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\ndiff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox\nindex de10312..34a09a0 100644\n--- a/t/t5100/sample.mbox\n+++ b/t/t5100/sample.mbox\n@@ -12,7 +12,7 @@ Subject: [PATCH] a commit.\n Here is a patch from A U Thor.\n \n ---\n- foo |    2 +-\n+ foo | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/foo b/foo\n@@ -52,7 +52,7 @@ two truly blank and another full of spaces in between.\n Hope this helps.\n \n ---\n- foo |    2 +-\n+ foo | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/foo b/foo\n@@ -83,7 +83,7 @@ Message-Id: <nitpicker.12121212@example.net>\n Hopefully this would fix the problem stated there.\n \n ---\n- foo |    2 +-\n+ foo | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/foo b/foo\n@@ -249,8 +249,8 @@ actual flags.\n Signed-off-by: David K=E5gedal <davidk@lysator.liu.se>\n ---\n \n- Documentation/git-cvsimport-script.txt |    9 ++++++++-\n- git-cvsimport-script                   |    4 ++--\n+ Documentation/git-cvsimport-script.txt | 9 ++++++++-\n+ git-cvsimport-script                   | 4 ++--\n  2 files changed, 10 insertions(+), 3 deletions(-)\n \n 50452f9c0c2df1f04d83a26266ba704b13861632\n@@ -379,7 +379,7 @@ Subject: [PATCH] a commit.\n Here is a patch from A U Thor.\n \n ---\n- foo |    2 +-\n+ foo | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/foo b/foo\n@@ -449,7 +449,7 @@ memcmp(\"Subject: \", header[i], 7) will never match.\n Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>\n Signed-off-by: Junio C Hamano <gitster@pobox.com>\n ---\n- builtin-mailinfo.c |    2 +-\n+ builtin-mailinfo.c | 2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n \n diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\n@@ -482,7 +482,7 @@ Content-Transfer-Encoding: quoted-printable\n Here comes a commit log message, and\n its second line is here.\n ---\n- builtin-mailinfo.c  |    4 ++--\n+ builtin-mailinfo.c  | 4 ++--\n \n diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\n index 3e5fe51..aabfe5c 100644\n@@ -587,7 +587,7 @@ everything before it in the message body.\n \n Signed-off-by: Junio C Hamano <gitster@pobox.com>\n ---\n- builtin-mailinfo.c |   37 ++++++++++++++++++++++++++++++++++++-\n+ builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-\n  1 files changed, 36 insertions(+), 1 deletions(-)\n \n diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c\ndiff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh\nindex 3b72c09..955f09f 100755\n--- a/t/t7602-merge-octopus-many.sh\n+++ b/t/t7602-merge-octopus-many.sh\n@@ -54,9 +54,9 @@ Trying simple merge with c2\n Trying simple merge with c3\n Trying simple merge with c4\n Merge made by the 'octopus' strategy.\n- c2.c |    1 +\n- c3.c |    1 +\n- c4.c |    1 +\n+ c2.c | 1 +\n+ c3.c | 1 +\n+ c4.c | 1 +\n  3 files changed, 3 insertions(+)\n  create mode 100644 c2.c\n  create mode 100644 c3.c\n@@ -71,7 +71,7 @@ test_expect_success 'merge output uses pretty names' '\n \n cat >expected <<\\EOF\n Merge made by the 'recursive' strategy.\n- c5.c |    1 +\n+ c5.c | 1 +\n  1 file changed, 1 insertion(+)\n  create mode 100644 c5.c\n EOF\n@@ -85,8 +85,8 @@ cat >expected <<\\EOF\n Fast-forwarding to: c1\n Trying simple merge with c2\n Merge made by the 'octopus' strategy.\n- c1.c |    1 +\n- c2.c |    1 +\n+ c1.c | 1 +\n+ c2.c | 1 +\n  2 files changed, 2 insertions(+)\n  create mode 100644 c1.c\n  create mode 100644 c2.c\n-- \n1.7.10.536.ge209c\n"},{"id":"190419","messageId":"7vobq8as95.fsf@alter.siamese.dyndns.org","threadId":"30371","inReplyTo":"1335818338-3657-1-git-send-email-zbyszek@in.waw.pl","subject":"Re: [PATCH resend] diff --stat: use less columns for change counts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-05-01T14:30:14Z","receivedAt":"2012-05-01T14:30:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> writes:\n\n> This resend applies and tests cleanly against both current next and pu.\n\nThanks; will queue.\n\n> old diff-stat:\n>  Documentation/gitcore-tutorial.txt                 |    4 +-\n>  diff.c                                             |   48 ++++++++++++++++----\n>  t/t0023-crlf-am.sh                                 |    2 +-\n>  t/t1200-tutorial.sh                                |    4 +-\n>  t/t3404-rebase-interactive.sh                      |    2 +-\n>  t/t3903-stash.sh                                   |    2 +-\n>  t/t4012-diff-binary.sh                             |   19 ++++++++\n>  ...\n>\n> new diff-stat:\n>  Documentation/gitcore-tutorial.txt                 |  4 +-\n>  diff.c                                             | 48 +++++++++++++++++-----\n>  t/t0023-crlf-am.sh                                 |  2 +-\n>  t/t1200-tutorial.sh                                |  4 +-\n>  t/t3404-rebase-interactive.sh                      |  2 +-\n>  t/t3903-stash.sh                                   |  2 +-\n>  t/t4012-diff-binary.sh                             | 19 +++++++++\n\nHaving said that, given the above miniscule differences, I am not really\nsure if it is worth 2300+ lines worth of code churn, though.\n"},{"id":"190423","messageId":"4FA00041.3070909@in.waw.pl","threadId":"30371","inReplyTo":"7vobq8as95.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH resend] diff --stat: use less columns for change counts","fromName":"Zbigniew Jędrzejewski-Szmek","fromEmail":"zbyszek@in.waw.pl","sentAt":"2012-05-01T15:24:49Z","receivedAt":"2012-05-01T15:24:49Z","isPatch":true,"sender":{"key":"zbyszek@in.waw.pl","avatar":"https://avatars.githubusercontent.com/u/349618?v=4"},"body":"On 05/01/2012 04:30 PM, Junio C Hamano wrote:\n> Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> writes:\n> \n>> This resend applies and tests cleanly against both current next and pu.\n> \n> Thanks; will queue.\n> \n>> old diff-stat:\n>>  Documentation/gitcore-tutorial.txt                 |    4 +-\n>>  diff.c                                             |   48 ++++++++++++++++----\n>>  t/t0023-crlf-am.sh                                 |    2 +-\n>>  t/t1200-tutorial.sh                                |    4 +-\n>>  t/t3404-rebase-interactive.sh                      |    2 +-\n>>  t/t3903-stash.sh                                   |    2 +-\n>>  t/t4012-diff-binary.sh                             |   19 ++++++++\n>>  ...\n>>\n>> new diff-stat:\n>>  Documentation/gitcore-tutorial.txt                 |  4 +-\n>>  diff.c                                             | 48 +++++++++++++++++-----\n>>  t/t0023-crlf-am.sh                                 |  2 +-\n>>  t/t1200-tutorial.sh                                |  4 +-\n>>  t/t3404-rebase-interactive.sh                      |  2 +-\n>>  t/t3903-stash.sh                                   |  2 +-\n>>  t/t4012-diff-binary.sh                             | 19 +++++++++\n> \n> Having said that, given the above miniscule differences, I am not really\n> sure if it is worth 2300+ lines worth of code churn, though.\nYeah, I understand that. So I leave it to your decision.\n\nThanks,\nZbyszek\n"}]}