diff --stat: use less columns for change counts

Number of columns required for change counts is now computed based on
the maximum number of changed lines instead of being fixed. This means
that usually a few more columns will be available for the filenames
and the graph.

The graph width logic is also modified to include enough space for
"Bin XXX -> YYY bytes".

If changes to binary files are mixed with changes to text files,
change counts are padded to take at least three columns. And the other
way around, if change counts require more than three columns, then
"Bin"s are padded to align with the change count. This way, the +-
part starts in the same column as "XXX -> YYY" part for binary files.
This makes the graph easier to parse visually thanks to the empty
column. This mimics the layout of diff --stat before this change.

Tests and the tutorial are updated to reflect the new --stat output.
This means either the removal of extra padding and/or the addition of
up to three extra characters to truncated filenames. One test is added
to check the graph alignment when a binary file change and text file
change of more than 999 lines are committed together.

Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index fb0d5692a4d2e898da0dea9c346420467722badc..5b5d5a4c6c68c067e1ea7d3a6e98242c18af405a 100644 (file)
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -1002,8 +1002,8 @@ would be different)
 ----------------
 Updating from ae3a2da... to a80b4aa....
 Fast-forward (no commit created; -m option ignored)
 ----------------
 Updating from ae3a2da... to a80b4aa....
 Fast-forward (no commit created; -m option ignored)

- example |    1 +
- hello   |    1 +
+ example | 1 +
+ hello   | 1 +

  2 files changed, 2 insertions(+)
 ----------------
 
  2 files changed, 2 insertions(+)
 ----------------
 

diff --git a/diff.c b/diff.c
index 22288b0106258e4f2c170f9e51dbf72f563179bd..c316e0cbfbb788a6e0066069c3425b1f712e543b 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1443,8 +1443,8 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 {
        int i, len, add, del, adds = 0, dels = 0;
        uintmax_t max_change = 0, max_len = 0;
 {
        int i, len, add, del, adds = 0, dels = 0;
        uintmax_t max_change = 0, max_len = 0;

-       int total_files = data->nr;
-       int width, name_width, graph_width, number_width = 4, count;
+       int total_files = data->nr, count;
+       int width, name_width, graph_width, number_width = 0, bin_width = 0;

        const char *reset, *add_c, *del_c;
        const char *line_prefix = "";
        int extra_shown = 0;
        const char *reset, *add_c, *del_c;
        const char *line_prefix = "";
        int extra_shown = 0;


@@ -1480,8 +1480,21 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
                if (max_len < len)
                        max_len = len;
 
                if (max_len < len)
                        max_len = len;
 

-               if (file->is_binary || file->is_unmerged)
+               if (file->is_unmerged) {
+                       /* "Unmerged" is 8 characters */
+                       bin_width = bin_width < 8 ? 8 : bin_width;

                        continue;
                        continue;

+               }
+               if (file->is_binary) {
+                       /* "Bin XXX -> YYY bytes" */
+                       int w = 14 + decimal_width(file->added)
+                               + decimal_width(file->deleted);
+                       bin_width = bin_width < w ? w : bin_width;
+                       /* Display change counts aligned with "Bin" */
+                       number_width = 3;
+                       continue;
+               }
+

                if (max_change < change)
                        max_change = change;
        }
                if (max_change < change)
                        max_change = change;
        }


@@ -1506,12 +1519,22 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
         * stat_name_width fixes the maximum width of the filename,
         * and is also used to divide available columns if there
         * aren't enough.
         * stat_name_width fixes the maximum width of the filename,
         * and is also used to divide available columns if there
         * aren't enough.

+        *
+        * Binary files are displayed with "Bin XXX -> YYY bytes"
+        * instead of the change count and graph. This part is treated
+        * similarly to the graph part, except that it is not
+        * "scaled". If total width is too small to accomodate the
+        * guaranteed minimum width of the filename part and the
+        * separators and this message, this message will "overflow"
+        * making the line longer than the maximum width.

         */
 
        if (options->stat_width == -1)
                width = term_columns();
        else
                width = options->stat_width ? options->stat_width : 80;
         */
 
        if (options->stat_width == -1)
                width = term_columns();
        else
                width = options->stat_width ? options->stat_width : 80;

+       number_width = decimal_width(max_change) > number_width ?
+               decimal_width(max_change) : number_width;

 
        if (options->stat_graph_width == -1)
                options->stat_graph_width = diff_stat_graph_width;
 
        if (options->stat_graph_width == -1)
                options->stat_graph_width = diff_stat_graph_width;


@@ -1525,10 +1548,14 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
 
        /*
         * First assign sizes that are wanted, ignoring available width.
 
        /*
         * First assign sizes that are wanted, ignoring available width.

+        * strlen("Bin XXX -> YYY bytes") == bin_width, and the part
+        * starting from "XXX" should fit in graph_width.

         */
         */

-       graph_width = (options->stat_graph_width &&
-                      options->stat_graph_width < max_change) ?
-               options->stat_graph_width : max_change;
+       graph_width = max_change + 4 > bin_width ? max_change : bin_width - 4;
+       if (options->stat_graph_width &&
+           options->stat_graph_width < graph_width)
+               graph_width = options->stat_graph_width;
+

        name_width = (options->stat_name_width > 0 &&
                      options->stat_name_width < max_len) ?
                options->stat_name_width : max_len;
        name_width = (options->stat_name_width > 0 &&
                      options->stat_name_width < max_len) ?
                options->stat_name_width : max_len;


@@ -1583,7 +1610,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
                if (data->files[i]->is_binary) {
                        fprintf(options->file, "%s", line_prefix);
                        show_name(options->file, prefix, name, len);
                if (data->files[i]->is_binary) {
                        fprintf(options->file, "%s", line_prefix);
                        show_name(options->file, prefix, name, len);

-                       fprintf(options->file, "  Bin ");
+                       fprintf(options->file, " %*s ", number_width, "Bin");

                        fprintf(options->file, "%s%"PRIuMAX"%s",
                                del_c, deleted, reset);
                        fprintf(options->file, " -> ");
                        fprintf(options->file, "%s%"PRIuMAX"%s",
                                del_c, deleted, reset);
                        fprintf(options->file, " -> ");


@@ -1596,7 +1623,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
                else if (data->files[i]->is_unmerged) {
                        fprintf(options->file, "%s", line_prefix);
                        show_name(options->file, prefix, name, len);
                else if (data->files[i]->is_unmerged) {
                        fprintf(options->file, "%s", line_prefix);
                        show_name(options->file, prefix, name, len);

-                       fprintf(options->file, "  Unmerged\n");
+                       fprintf(options->file, " Unmerged\n");

                        continue;
                }
 
                        continue;
                }
 


@@ -1625,8 +1652,9 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
                }
                fprintf(options->file, "%s", line_prefix);
                show_name(options->file, prefix, name, len);
                }
                fprintf(options->file, "%s", line_prefix);
                show_name(options->file, prefix, name, len);

-               fprintf(options->file, "%5"PRIuMAX"%s", added + deleted,
-                               added + deleted ? " " : "");
+               fprintf(options->file, " %*"PRIuMAX"%s",
+                       number_width, added + deleted,
+                       added + deleted ? " " : "");

                show_graph(options->file, '+', add, add_c, reset);
                show_graph(options->file, '-', del, del_c, reset);
                fprintf(options->file, "\n");
                show_graph(options->file, '+', add, add_c, reset);
                show_graph(options->file, '-', del, del_c, reset);
                fprintf(options->file, "\n");

diff --git a/t/t0023-crlf-am.sh b/t/t0023-crlf-am.sh
index aaed7254023b86a30c499db7c4b069c9d08b1085..f9bbb91f64e35d284a4ac79a6b2ecaa1d2913455 100755 (executable)
--- a/t/t0023-crlf-am.sh
+++ b/t/t0023-crlf-am.sh
@@ -11,7 +11,7 @@ Date: Thu, 23 Aug 2007 13:00:00 +0200
 Subject: test1
 
 ---
 Subject: test1
 
 ---

- foo |    1 +
+ foo | 1 +

  1 files changed, 1 insertions(+), 0 deletions(-)
  create mode 100644 foo
 
  1 files changed, 1 insertions(+), 0 deletions(-)
  create mode 100644 foo
 

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index 9356beaf4be45c32d10209c5063b7a9c5aa06d42..397ccb690908dad2d45bab3d249f9c62f2dc91d1 100755 (executable)
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -154,8 +154,8 @@ test_expect_success 'git show-branch' '
 cat > resolve.expect << EOF
 Updating VARIABLE..VARIABLE
 FASTFORWARD (no commit created; -m option ignored)
 cat > resolve.expect << EOF
 Updating VARIABLE..VARIABLE
 FASTFORWARD (no commit created; -m option ignored)

- example |    1 +
- hello   |    1 +
+ example | 1 +
+ hello   | 1 +

  2 files changed, 2 insertions(+)
 EOF
 
  2 files changed, 2 insertions(+)
 EOF
 

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 7fd2127625506c39371bda873ec2f56593b65aca..4983bd77753307a7f93963b02534f36ae6fc71bb 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -323,7 +323,7 @@ test_expect_success 'verbose flag is heeded, even after --continue' '
        echo resolved > file1 &&
        git add file1 &&
        git rebase --continue > output &&
        echo resolved > file1 &&
        git add file1 &&
        git rebase --continue > output &&

-       grep "^ file1 |    2 +-$" output
+       grep "^ file1 | 2 +-$" output

 '
 
 test_expect_success 'multi-squash only fires up editor once' '
 '
 
 test_expect_success 'multi-squash only fires up editor once' '

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 3addb804d56fe2f0bcbf2d78bddd541880098c8d..cd042633ba5ec36be89507d25254b32a8f0b98ae 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -443,7 +443,7 @@ test_expect_success 'stash show format defaults to --stat' '
        STASH_ID=$(git stash create) &&
        git reset --hard &&
        cat >expected <<-EOF &&
        STASH_ID=$(git stash create) &&
        git reset --hard &&
        cat >expected <<-EOF &&

-        file |    1 +
+        file | 1 +

         1 file changed, 1 insertion(+)
        EOF
        git stash show ${STASH_ID} >actual &&
         1 file changed, 1 insertion(+)
        EOF
        git stash show ${STASH_ID} >actual &&

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index ed24ddd88a828408f4edca008b559a70f5749769..8b4e80de9627d9a8fa90a31edbe05c2c70f1d4b3 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -107,4 +107,23 @@ test_expect_success 'diff --no-index with binary creation' '
        test_cmp expected actual
 '
 
        test_cmp expected actual
 '
 

+cat >expect <<EOF
+ binfile  |   Bin 0 -> 1026 bytes
+ textfile | 10000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+EOF
+
+test_expect_success 'diff --stat with binary files and big change count' '
+       echo X | dd of=binfile bs=1k seek=1 &&
+       git add binfile &&
+       i=0 &&
+       while test $i -lt 10000; do
+               echo $i &&
+               i=$(($i + 1))
+       done >textfile &&
+       git add textfile &&
+       git diff --cached --stat binfile textfile >output &&
+       grep " | " output >actual &&
+       test_cmp expect actual
+'
+

 test_done
 test_done

diff --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
index 2f8560c369c01e72b8ec11d43e04df0a0e9ce60c..9951e3677d694304e3d52448e7a12d881c1943af 100644 (file)
--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
@@ -1,7 +1,7 @@
 $ git diff-tree --cc --patch-with-stat --summary master
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 $ git diff-tree --cc --patch-with-stat --summary master
 59d314ad6f356dd08601a4cd5e530381da3e3c64

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --cc dir/sub
  2 files changed, 5 insertions(+)
 
 diff --cc dir/sub

diff --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
index 72e03c14fb4edb2812202da8acd837b064131510..cec33fa3f02b2b8990b51b61c6e1f361e9c9b208 100644 (file)
--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side
+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side
@@ -1,8 +1,8 @@
 $ git diff-tree --cc --patch-with-stat --summary side
 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 $ git diff-tree --cc --patch-with-stat --summary side
 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
index 8b357d964b4773c3078e2c32bd3e765f5749841c..db3c0a7b2cc5d98b85e22074df924f3cb666b840 100644 (file)
--- a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
@@ -1,7 +1,7 @@
 $ git diff-tree --cc --patch-with-stat master
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 $ git diff-tree --cc --patch-with-stat master
 59d314ad6f356dd08601a4cd5e530381da3e3c64

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --cc dir/sub
  2 files changed, 5 insertions(+)
 
 diff --cc dir/sub

diff --git a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--stat_--summary_master
index e0568d688311059ad04558f50bb3ddacd21fd403..d019867dd9415bc9fef748e4204c2376fa97b2f1 100644 (file)
--- a/t/t4013/diff.diff-tree_--cc_--stat_--summary_master
+++ b/t/t4013/diff.diff-tree_--cc_--stat_--summary_master
@@ -1,6 +1,6 @@
 $ git diff-tree --cc --stat --summary master
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 $ git diff-tree --cc --stat --summary master
 59d314ad6f356dd08601a4cd5e530381da3e3c64

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 $
  2 files changed, 5 insertions(+)
 $

diff --git a/t/t4013/diff.diff-tree_--cc_--stat_--summary_side b/t/t4013/diff.diff-tree_--cc_--stat_--summary_side
index 5afc8239a11f7f7fc20a3fabfad5213eb49fd153..12b2eee17ec04a40a10f0c7300379e01755c0114 100644 (file)
--- a/t/t4013/diff.diff-tree_--cc_--stat_--summary_side
+++ b/t/t4013/diff.diff-tree_--cc_--stat_--summary_side
@@ -1,8 +1,8 @@
 $ git diff-tree --cc --stat --summary side
 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 $ git diff-tree --cc --stat --summary side
 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 $
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 $

diff --git a/t/t4013/diff.diff-tree_--cc_--stat_master b/t/t4013/diff.diff-tree_--cc_--stat_master
index f48367a89a64945875a81024e444b35771800855..40b91796b34a1f22b51414d48c76152b4dc881ca 100644 (file)
--- a/t/t4013/diff.diff-tree_--cc_--stat_master
+++ b/t/t4013/diff.diff-tree_--cc_--stat_master
@@ -1,6 +1,6 @@
 $ git diff-tree --cc --stat master
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 $ git diff-tree --cc --stat master
 59d314ad6f356dd08601a4cd5e530381da3e3c64

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 $
  2 files changed, 5 insertions(+)
 $

diff --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
index 590864c2d798472a3fed9fd6bf1fa41545fd572d..817ed06f822e28a0b15a71c2c8bb519e3cdcde67 100644 (file)
--- 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
@@ -1,8 +1,8 @@
 $ git diff-tree --pretty=oneline --root --patch-with-stat initial
 444ac553ac7612cc88969031b02b3767fb8a353a Initial
 $ git diff-tree --pretty=oneline --root --patch-with-stat initial
 444ac553ac7612cc88969031b02b3767fb8a353a Initial

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side b/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side
index e05e77875ccdaa8a258310f85f5753ae84b4c6c4..fe3f6b7c7e799cd3e99b46742feccec2cfce5634 100644 (file)
--- a/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side
+++ b/t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --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
index 0e2c956633d28897e7bbddb58ad1cc053e55a8a6..06eb77e3861c321765bb77e701703db9400919a3 100644 (file)
--- a/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial
+++ b/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial b/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial
index 384fa44ddd1ab9dbf0d38caf1f445fed1a0b5030..680eab5f27961e0a1ee6c26e0bd28f0aaa4a2c62 100644 (file)
--- a/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial
+++ b/t/t4013/diff.diff-tree_--pretty_--root_--stat_--summary_initial
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 
 
     Initial
 

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0
  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0

diff --git a/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial b/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial
index 10384a83d31da363cec05f2fecb9def43ae158d7..9722d1b3a76ad89bedaab114a1800a88157bf8d1 100644 (file)
--- a/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial
+++ b/t/t4013/diff.diff-tree_--pretty_--root_--stat_initial
@@ -5,8 +5,8 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 
 
     Initial
 

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
 $
  3 files changed, 8 insertions(+)
 $

diff --git a/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial b/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial
index f57062ea07ac63aa7c700e470aa43d1ede20e09b..ad69ffe647bbd692d307c0b7a8d047b8c79b3a2d 100644 (file)
--- a/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial
+++ b/t/t4013/diff.diff-tree_--root_--patch-with-stat_initial
@@ -1,8 +1,8 @@
 $ git diff-tree --root --patch-with-stat initial
 444ac553ac7612cc88969031b02b3767fb8a353a
 $ git diff-tree --root --patch-with-stat initial
 444ac553ac7612cc88969031b02b3767fb8a353a

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.diff-tree_-c_--stat_--summary_master b/t/t4013/diff.diff-tree_-c_--stat_--summary_master
index 7088683444e54a026e201849ef5d635fab66fc3b..81c3021541bc61ec36557822d314c2e57e0a1265 100644 (file)
--- a/t/t4013/diff.diff-tree_-c_--stat_--summary_master
+++ b/t/t4013/diff.diff-tree_-c_--stat_--summary_master
@@ -1,6 +1,6 @@
 $ git diff-tree -c --stat --summary master
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 $ git diff-tree -c --stat --summary master
 59d314ad6f356dd08601a4cd5e530381da3e3c64

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 $
  2 files changed, 5 insertions(+)
 $

diff --git a/t/t4013/diff.diff-tree_-c_--stat_--summary_side b/t/t4013/diff.diff-tree_-c_--stat_--summary_side
index ef216abb1dcaa91d1aa521599b25faf16f704124..e8dc12bfbf65577ad74bfe5bc9b2c8a838531eef 100644 (file)
--- a/t/t4013/diff.diff-tree_-c_--stat_--summary_side
+++ b/t/t4013/diff.diff-tree_-c_--stat_--summary_side
@@ -1,8 +1,8 @@
 $ git diff-tree -c --stat --summary side
 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 $ git diff-tree -c --stat --summary side
 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 $
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 $

diff --git a/t/t4013/diff.diff-tree_-c_--stat_master b/t/t4013/diff.diff-tree_-c_--stat_master
index ad19f103eb3323d1c84719cec13a09885e3b47f4..89d59b15480f073d026cfbe6fca6ae31522cef22 100644 (file)
--- a/t/t4013/diff.diff-tree_-c_--stat_master
+++ b/t/t4013/diff.diff-tree_-c_--stat_master
@@ -1,6 +1,6 @@
 $ git diff-tree -c --stat master
 59d314ad6f356dd08601a4cd5e530381da3e3c64
 $ git diff-tree -c --stat master
 59d314ad6f356dd08601a4cd5e530381da3e3c64

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 $
  2 files changed, 5 insertions(+)
 $

diff --git a/t/t4013/diff.diff_--patch-with-stat_-r_initial..side b/t/t4013/diff.diff_--patch-with-stat_-r_initial..side
index ddad917ae80a5c80b2c7b7f65a85a19404b59945..be8d1ea1bd2d2b0b254b2483162df6d2735af8f8 100644 (file)
--- a/t/t4013/diff.diff_--patch-with-stat_-r_initial..side
+++ b/t/t4013/diff.diff_--patch-with-stat_-r_initial..side
@@ -1,7 +1,7 @@
 $ git diff --patch-with-stat -r initial..side
 $ git diff --patch-with-stat -r initial..side

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.diff_--patch-with-stat_initial..side b/t/t4013/diff.diff_--patch-with-stat_initial..side
index bdbd114d8eaf5dd6f40502300c479839a61f0d6b..5424e6d5669ac11b55376f414439213643d6eade 100644 (file)
--- a/t/t4013/diff.diff_--patch-with-stat_initial..side
+++ b/t/t4013/diff.diff_--patch-with-stat_initial..side
@@ -1,7 +1,7 @@
 $ git diff --patch-with-stat initial..side
 $ git diff --patch-with-stat initial..side

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.diff_--stat_initial..side b/t/t4013/diff.diff_--stat_initial..side
index 6d08f3d3550413a23c08e264b4707dafeba21acf..b7741e2b8367196c04366ac911c6837531b8a34d 100644 (file)
--- a/t/t4013/diff.diff_--stat_initial..side
+++ b/t/t4013/diff.diff_--stat_initial..side
@@ -1,6 +1,6 @@
 $ git diff --stat initial..side
 $ git diff --stat initial..side

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 $
  3 files changed, 9 insertions(+)
 $

diff --git a/t/t4013/diff.diff_-r_--stat_initial..side b/t/t4013/diff.diff_-r_--stat_initial..side
index 2ddb2540e640584532dd7b22d1618b35b322a20d..5d514f55b9382aa83f9415e65cc9039eb9b5f5c4 100644 (file)
--- a/t/t4013/diff.diff_-r_--stat_initial..side
+++ b/t/t4013/diff.diff_-r_--stat_initial..side
@@ -1,6 +1,6 @@
 $ git diff -r --stat initial..side
 $ git diff -r --stat initial..side

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 $
  3 files changed, 9 insertions(+)
 $

diff --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
index 3cab049f7d98bfe9988c9f19fe477d0d29c8c2d5..547ca065a59cd7ed4cb74dffe570db81e9fd9c0e 100644 (file)
--- a/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
+++ b/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
@@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master b/t/t4013/diff.format-patch_--attach_--stdout_initial..master
index 564a4d38f229946ea08e9c0110a5ad6a20acce0b..52fedc179e50de8f6dc61dbe069dc2737099f0b9 100644 (file)
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master
@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
index 4f28460b83dd47a1446fc5c110025816611e2a54..1c3cde251b53cc8dfe476210411d22d61f24d473 100644 (file)
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 

diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..side b/t/t4013/diff.format-patch_--attach_--stdout_initial..side
index b10cc2e251cf7e38592ae26279b9613758a47b35..4717bd8313ee7201d7c3be79439d658a73440a37 100644 (file)
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..side
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..side
@@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --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
index a976a8aaf42b2fa03fd35d215de9cafee99b946c..02c4db7ec582426bf447783d347592c1884e9f89 100644 (file)
--- a/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
+++ b/t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --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
index b4fd66477aa251c56da1e532d83b7d56ec79d25b..c7677c5951c3949ffa9789d68dff031f55247108 100644 (file)
--- 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
@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_initial..master
index 0d31036e7f573d70f0ec3c00b67b61291a663671..5b3e34e2c0c6e063ff03e32c07ed0435e9650348 100644 (file)
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master
@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -121,9 +121,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
index 18d47144231ab36e6f020071b1b8599dd2e76ace..d13f8a81280100a0ed18b547dfc7baf7bde0eb6e 100644 (file)
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^
@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -73,8 +73,8 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 

diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
index 29e00ab8af8503e6da3b15c55147da550d4919f7..caec5537de3f158166aae80a99f68f99c619eccc 100644 (file)
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
@@ -14,9 +14,9 @@ Content-Transfer-Encoding: 8bit
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 

diff --git a/t/t4013/diff.format-patch_--inline_--stdout_initial..side b/t/t4013/diff.format-patch_--inline_--stdout_initial..side
index 3572f20b5d4a1834d1c60ca05eca11efd8b46375..d3a6762130cdd168733e7f510e84b02778411aca 100644 (file)
--- a/t/t4013/diff.format-patch_--inline_--stdout_initial..side
+++ b/t/t4013/diff.format-patch_--inline_--stdout_initial..side
@@ -12,9 +12,9 @@ Content-Type: text/plain; charset=UTF-8; format=fixed
 Content-Transfer-Encoding: 8bit
 
 ---
 Content-Transfer-Encoding: 8bit
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --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^
index 54cdcdab40f321559038c954fab572e532801b8b..244d964fc67d3f2cec759eabdc2f245a72549563 100644 (file)
--- a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
+++ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
@@ -10,10 +10,10 @@ A U Thor (2):
   Second
   Third
 
   Second
   Third
 

- dir/sub |    4 ++++
- file0   |    3 +++
- file1   |    3 +++
- file2   |    3 ---
+ dir/sub | 4 ++++
+ file0   | 3 +++
+ file1   | 3 +++
+ file2   | 3 ---

  4 files changed, 10 insertions(+), 3 deletions(-)
  create mode 100644 file1
  delete mode 100644 file2
  4 files changed, 10 insertions(+), 3 deletions(-)
  create mode 100644 file1
  delete mode 100644 file2


@@ -28,9 +28,9 @@ Subject: [DIFFERENT_PREFIX 1/2] Second
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -73,8 +73,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
 Subject: [DIFFERENT_PREFIX 2/2] Third
 
 ---
 Subject: [DIFFERENT_PREFIX 2/2] Third
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 

diff --git a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
index 23194ebdaa8defaca544a0f6d18d449a44fcd5f1..bfc287a147d25d37e5a0ae111e38182c1075778d 100644 (file)
--- a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
+++ b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
@@ -6,9 +6,9 @@ Subject: [PATCH] Second
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
 Subject: [PATCH] Third
 
 ---
 Subject: [PATCH] Third
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000
 Subject: [PATCH] Side
 
 ---
 Subject: [PATCH] Side
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--numbered_initial..master
index 78f1a80a976ac54cc53602f203cae96f12be65dc..568f6f584e63a4b711fd341b02a359270ef62b87 100644 (file)
--- a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master
+++ b/t/t4013/diff.format-patch_--stdout_--numbered_initial..master
@@ -6,9 +6,9 @@ Subject: [PATCH 1/3] Second
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
 Subject: [PATCH 2/3] Third
 
 ---
 Subject: [PATCH 2/3] Third
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000
 Subject: [PATCH 3/3] Side
 
 ---
 Subject: [PATCH 3/3] Side
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.format-patch_--stdout_initial..master b/t/t4013/diff.format-patch_--stdout_initial..master
index a3dab7f773d71da1f1b1ade10b24cf9562ff7d1b..5f0352f9f70ceb2c40e2a24160c14887e4a6ca8f 100644 (file)
--- a/t/t4013/diff.format-patch_--stdout_initial..master
+++ b/t/t4013/diff.format-patch_--stdout_initial..master
@@ -6,9 +6,9 @@ Subject: [PATCH 1/3] Second
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
 Subject: [PATCH 2/3] Third
 
 ---
 Subject: [PATCH 2/3] Third
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -85,9 +85,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000
 Subject: [PATCH 3/3] Side
 
 ---
 Subject: [PATCH 3/3] Side
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..master^
index 39f4a3f2d1f50ce49792f4fcc6373d003ebf971b..2ae454d807370143aacf2b6655d80361cb975c6f 100644 (file)
--- a/t/t4013/diff.format-patch_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--stdout_initial..master^
@@ -6,9 +6,9 @@ Subject: [PATCH 1/2] Second
 
 This is the second commit.
 ---
 
 This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -51,8 +51,8 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000
 Subject: [PATCH 2/2] Third
 
 ---
 Subject: [PATCH 2/2] Third
 
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 

diff --git a/t/t4013/diff.format-patch_--stdout_initial..side b/t/t4013/diff.format-patch_--stdout_initial..side
index 88109209db005188c9e70fdd40b906756119dd69..a7d52fbeeaf15b8146e431c90387ccd55754db59 100644 (file)
--- a/t/t4013/diff.format-patch_--stdout_initial..side
+++ b/t/t4013/diff.format-patch_--stdout_initial..side
@@ -5,9 +5,9 @@ Date: Mon, 26 Jun 2006 00:03:00 +0000
 Subject: [PATCH] Side
 
 ---
 Subject: [PATCH] Side
 
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
index 4085bbde870d0810c69e7d78ef94052df385826c..a18f1472a9a4b5b098a2c342a9f77fc68a3b6dc0 100644 (file)
--- a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
@@ -12,7 +12,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -31,7 +31,7 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -53,7 +53,7 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_master
index 458627953e29c80b8bed0e640db1c580946a0194..ae425c4672200ad73cb2db228bd7385757673ee3 100644 (file)
--- a/t/t4013/diff.log_--patch-with-stat_master
+++ b/t/t4013/diff.log_--patch-with-stat_master
@@ -12,9 +12,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -54,8 +54,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  2 files changed, 5 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -86,9 +86,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
index 6e172cfadd04785269e0060fa55e86b3df117195..d5207cadf4483a7e63b6085a9007623c73b1a694 100644 (file)
--- a/t/t4013/diff.log_--patch-with-stat_master_--_dir_
+++ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
@@ -12,7 +12,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -31,7 +31,7 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -53,7 +53,7 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --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
index 48b0d4b91dfa427c1f0971bedbad61931e103bb7..0fc1e8cd71fee38125e77487da29c12c5863a054 100644 (file)
--- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
@@ -6,8 +6,8 @@ Date:   Mon Jun 26 00:04:00 2006 +0000
 
     Merge branch 'side'
 
 
     Merge branch 'side'
 

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --cc dir/sub
  2 files changed, 5 insertions(+)
 
 diff --cc dir/sub


@@ -44,9 +44,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 


@@ -87,8 +87,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -162,9 +162,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0
  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0

diff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
index f9dc5122e2a436a62fa80bdf820b4d44cacdfe8e..dffc09dde9e03179f48cea86e04aac34f1d30504 100644 (file)
--- a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
@@ -12,9 +12,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 


@@ -55,8 +55,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -88,9 +88,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -130,9 +130,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0
  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0

diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_master
index 0807ece2347ac54f87c860904ef257c766da5dd0..55aa98012dece9e96d1092f442b6235d420ca42f 100644 (file)
--- a/t/t4013/diff.log_--root_--patch-with-stat_master
+++ b/t/t4013/diff.log_--root_--patch-with-stat_master
@@ -12,9 +12,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -54,8 +54,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  2 files changed, 5 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -86,9 +86,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/dir/sub b/dir/sub


@@ -127,9 +127,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --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
index 84f5ef69119edf44e967fa09e3c6acd0bdc6b715..019d85f7de6c2d360ae2f9addd65bacd9bee318b 100644 (file)
--- a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
@@ -6,8 +6,8 @@ Date:   Mon Jun 26 00:04:00 2006 +0000
 
     Merge branch 'side'
 
 
     Merge branch 'side'
 

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --combined dir/sub
  2 files changed, 5 insertions(+)
 
 diff --combined dir/sub


@@ -44,9 +44,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 


@@ -87,8 +87,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -162,9 +162,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0
  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0

diff --git a/t/t4013/diff.show_--patch-with-stat_--summary_side b/t/t4013/diff.show_--patch-with-stat_--summary_side
index e60384d24de317e9f9d6dac222d8123ae4d68e02..95a474ef1d54889bb8fd599a34c2efe101697b6e 100644 (file)
--- a/t/t4013/diff.show_--patch-with-stat_--summary_side
+++ b/t/t4013/diff.show_--patch-with-stat_--summary_side
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 

diff --git a/t/t4013/diff.show_--patch-with-stat_side b/t/t4013/diff.show_--patch-with-stat_side
index a3a3255fd3f508ddd47a92cb47552dde3ab8156a..974e99be820e40c68f5ca290519375a8a14cb0c6 100644 (file)
--- a/t/t4013/diff.show_--patch-with-stat_side
+++ b/t/t4013/diff.show_--patch-with-stat_side
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.show_--stat_--summary_side b/t/t4013/diff.show_--stat_--summary_side
index d16f464aca8f83264f53f0355bb3be84eddf1bd8..a71492f9bf4e96e2017a3343cff97038f7ee6610 100644 (file)
--- a/t/t4013/diff.show_--stat_--summary_side
+++ b/t/t4013/diff.show_--stat_--summary_side
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 
 
     Side
 

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 $
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 $

diff --git a/t/t4013/diff.show_--stat_side b/t/t4013/diff.show_--stat_side
index 6300c0535fff7e4a82fdfb6511392b006f5dfa0c..9be712458f4494f0b5f79030ccc9252fc9f1525c 100644 (file)
--- a/t/t4013/diff.show_--stat_side
+++ b/t/t4013/diff.show_--stat_side
@@ -5,8 +5,8 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 
 
     Side
 

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 $
  3 files changed, 9 insertions(+)
 $

diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
index 16ae54345f6a1e93fae3ad7269829b32eaab3739..c8b6af2f4381571b5168bc78ab57cd5f5adac4d1 100644 (file)
--- a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
+++ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
@@ -5,7 +5,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -24,7 +24,7 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -46,7 +46,7 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master b/t/t4013/diff.whatchanged_--patch-with-stat_master
index f3e45ec270ace186d58f40a21a9763598d6dc0ac..1ac431ba9212d3ba8147ab44a657293e5b9b2558 100644 (file)
--- a/t/t4013/diff.whatchanged_--patch-with-stat_master
+++ b/t/t4013/diff.whatchanged_--patch-with-stat_master
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -47,8 +47,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  2 files changed, 5 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -79,9 +79,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
index c77f0bc320f0241550e9027f7ecb191d77f85b43..b30c28588f9ae44c9fcf2cf96feea9db949361e5 100644 (file)
--- a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
+++ b/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
@@ -5,7 +5,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -24,7 +24,7 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -46,7 +46,7 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
+ dir/sub | 2 ++

  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  1 file changed, 2 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --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
index 8d03efea6ce33bb52018eeedc02629c6bd9253aa..30aae7817b952d1088c872453a6a38a681fcd946 100644 (file)
--- a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
@@ -6,8 +6,8 @@ Date:   Mon Jun 26 00:04:00 2006 +0000
 
     Merge branch 'side'
 
 
     Merge branch 'side'
 

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --cc dir/sub
  2 files changed, 5 insertions(+)
 
 diff --cc dir/sub


@@ -44,9 +44,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 


@@ -87,8 +87,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -162,9 +162,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0
  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0

diff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
index 1874d0616c4d6cf308a6fcc0f59a0d552664777f..db90e5152547bc92c4ff158e044aa3d18c764783 100644 (file)
--- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 


@@ -48,8 +48,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -81,9 +81,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -123,9 +123,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0
  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0

diff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_master
index 5211ff2a757b8db234ec1f4b14ae33300c21296a..9a6cc92ce7de88b564c1d95d611ba1ae632571af 100644 (file)
--- a/t/t4013/diff.whatchanged_--root_--patch-with-stat_master
+++ b/t/t4013/diff.whatchanged_--root_--patch-with-stat_master
@@ -5,9 +5,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 9 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -47,8 +47,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  2 files changed, 5 insertions(+)
 
 diff --git a/dir/sub b/dir/sub


@@ -79,9 +79,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/dir/sub b/dir/sub


@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub
  3 files changed, 8 insertions(+)
 
 diff --git a/dir/sub b/dir/sub

diff --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
index ad30245a59b94ed18bf9e1bfca3eb0077cd3a14a..d1d32bd34c333411661355685368130faec79764 100644 (file)
--- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
@@ -6,8 +6,8 @@ Date:   Mon Jun 26 00:04:00 2006 +0000
 
     Merge branch 'side'
 
 
     Merge branch 'side'
 

- dir/sub |    2 ++
- file0   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++

  2 files changed, 5 insertions(+)
 
 diff --combined dir/sub
  2 files changed, 5 insertions(+)
 
 diff --combined dir/sub


@@ -44,9 +44,9 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 
     Side
 ---
 
     Side
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file3   |    4 ++++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++

  3 files changed, 9 insertions(+)
  create mode 100644 file3
 
  3 files changed, 9 insertions(+)
  create mode 100644 file3
 


@@ -87,8 +87,8 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
 ---
 
     Third
 ---

- dir/sub |    2 ++
- file1   |    3 +++
+ dir/sub | 2 ++
+ file1   | 3 +++

  2 files changed, 5 insertions(+)
  create mode 100644 file1
 
  2 files changed, 5 insertions(+)
  create mode 100644 file1
 


@@ -120,9 +120,9 @@ Date:   Mon Jun 26 00:01:00 2006 +0000
     
     This is the second commit.
 ---
     
     This is the second commit.
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 ---
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---

  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 
  3 files changed, 5 insertions(+), 3 deletions(-)
  delete mode 100644 file2
 


@@ -162,9 +162,9 @@ Date:   Mon Jun 26 00:00:00 2006 +0000
 
     Initial
 ---
 
     Initial
 ---

- dir/sub |    2 ++
- file0   |    3 +++
- file2   |    3 +++
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 +++

  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0
  3 files changed, 8 insertions(+)
  create mode 100644 dir/sub
  create mode 100644 file0

diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 3ec71184bac00c956b48ddc3f6c51a37cabcbbf2..97b81778cb8c9f3c06b551b1f7031c944ced70d0 100755 (executable)
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -73,13 +73,13 @@ test_expect_success TABS_IN_FILENAMES 'git diff --numstat -M HEAD' '
 
 test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '
        cat >expect <<-\EOF &&
 
 test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' '
        cat >expect <<-\EOF &&

-        pathname.1 => "Rpathname\twith HT.0"            |    0
-        pathname.3 => "Rpathname\nwith LF.0"            |    0
-        "pathname\twith HT.3" => "Rpathname\nwith LF.1" |    0
-        pathname.2 => Rpathname with SP.0               |    0
-        "pathname\twith HT.2" => Rpathname with SP.1    |    0
-        pathname.0 => Rpathname.0                       |    0
-        "pathname\twith HT.0" => Rpathname.1            |    0
+        pathname.1 => "Rpathname\twith HT.0"            | 0
+        pathname.3 => "Rpathname\nwith LF.0"            | 0
+        "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0
+        pathname.2 => Rpathname with SP.0               | 0
+        "pathname\twith HT.2" => Rpathname with SP.1    | 0
+        pathname.0 => Rpathname.0                       | 0
+        "pathname\twith HT.0" => Rpathname.1            | 0

         7 files changed, 0 insertions(+), 0 deletions(-)
        EOF
        git diff --stat -M HEAD >actual &&
         7 files changed, 0 insertions(+), 0 deletions(-)
        EOF
        git diff --stat -M HEAD >actual &&

diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index 06b05df848cded95827d2d8a2b410850fef4f5eb..d4ab4f2ccf9a1bbbc1e6af84df5f09c373f9f465 100755 (executable)
--- a/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@ -85,7 +85,7 @@ test_expect_success 'status -v produces text' '
 '
 
 cat >expect.stat <<'EOF'
 '
 
 cat >expect.stat <<'EOF'

- file |  Bin 2 -> 4 bytes
+ file | Bin 2 -> 4 bytes

  1 file changed, 0 insertions(+), 0 deletions(-)
 EOF
 test_expect_success 'diffstat does not run textconv' '
  1 file changed, 0 insertions(+), 0 deletions(-)
 EOF
 test_expect_success 'diffstat does not run textconv' '

diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
index 18fadcf06eac8054574fed153058776a447897ac..3950f5034d319be99695c9332b22a8d26e20ff32 100755 (executable)
--- a/t/t4045-diff-relative.sh
+++ b/t/t4045-diff-relative.sh
@@ -44,7 +44,7 @@ test_expect_success "--numstat $*" "
 check_stat() {
 expect=$1; shift
 cat >expected <<EOF
 check_stat() {
 expect=$1; shift
 cat >expected <<EOF

- $expect |    1 +
+ $expect | 1 +

  1 file changed, 1 insertion(+)
 EOF
 test_expect_success "--stat $*" "
  1 file changed, 1 insertion(+)
 EOF
 test_expect_success "--stat $*" "

diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index 591ffbc07539e6d45d4d0e8cc4d7c015f0952a3a..b41eb61ca8b1e66f618d480a28b2bc14815df2f7 100755 (executable)
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -14,8 +14,8 @@ test_expect_success setup '
        echo a >a &&
        echo b >b &&
        cat >expect <<-\EOF
        echo a >a &&
        echo b >b &&
        cat >expect <<-\EOF

-        a |    1 +
-        b |    1 +
+        a | 1 +
+        b | 1 +

         2 files changed, 2 insertions(+)
        EOF
        git diff --stat --stat-count=2 >actual &&
         2 files changed, 2 insertions(+)
        EOF
        git diff --stat --stat-count=2 >actual &&

diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index 328aa8f39865fb90d4b54991f158affa9cf2e1dc..4bdc7d43765352c9e6ab3c04f0432abbb55b8bf4 100755 (executable)
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -22,7 +22,7 @@ test_expect_success 'preparation' '
 while read cmd args
 do
        cat >expect <<-'EOF'
 while read cmd args
 do
        cat >expect <<-'EOF'

-        ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa |    1 +
+        ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +

        EOF
        test_expect_success "$cmd: small change with long name gives more space to the name" '
                git $cmd $args >output &&
        EOF
        test_expect_success "$cmd: small change with long name gives more space to the name" '
                git $cmd $args >output &&


@@ -31,7 +31,7 @@ do
        '
 
        cat >expect <<-'EOF'
        '
 
        cat >expect <<-'EOF'

-        ...aaaaaaaaaaaaaaaaaaaaaaaaaa |    1 +
+        ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +

        EOF
        test_expect_success "$cmd --stat=width: a long name is given more room when the bar is short" '
                git $cmd $args --stat=40 >output &&
        EOF
        test_expect_success "$cmd --stat=width: a long name is given more room when the bar is short" '
                git $cmd $args --stat=40 >output &&


@@ -46,7 +46,7 @@ do
        '
 
        cat >expect <<-'EOF'
        '
 
        cat >expect <<-'EOF'

-        ...aaaaaaaaaaaaaaaaaaaaaaaaaaa |    1 +
+        ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 +

        EOF
        test_expect_success "$cmd --stat=...,name-width with long name" '
                git $cmd $args --stat=60,30 >output &&
        EOF
        test_expect_success "$cmd --stat=...,name-width with long name" '
                git $cmd $args --stat=60,30 >output &&

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 32cf0bd218ea081e3e1d73400943b30a946f9dd5..71be59d446f773c4b567f00c469ac26225d11cb8 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -528,7 +528,7 @@ cat >expect <<\EOF
 | |
 | |     reach
 | | ---
 | |
 | |     reach
 | | ---

-| |  reach.t |    1 +
+| |  reach.t | 1 +

 | |  1 file changed, 1 insertion(+)
 | |
 | | diff --git a/reach.t b/reach.t
 | |  1 file changed, 1 insertion(+)
 | |
 | | diff --git a/reach.t b/reach.t


@@ -551,7 +551,7 @@ cat >expect <<\EOF
 | | |
 | | |       octopus-b
 | | |   ---
 | | |
 | | |       octopus-b
 | | |   ---

-| | |    octopus-b.t |    1 +
+| | |    octopus-b.t | 1 +

 | | |    1 file changed, 1 insertion(+)
 | | |
 | | |   diff --git a/octopus-b.t b/octopus-b.t
 | | |    1 file changed, 1 insertion(+)
 | | |
 | | |   diff --git a/octopus-b.t b/octopus-b.t


@@ -567,7 +567,7 @@ cat >expect <<\EOF
 | |
 | |       octopus-a
 | |   ---
 | |
 | |       octopus-a
 | |   ---

-| |    octopus-a.t |    1 +
+| |    octopus-a.t | 1 +

 | |    1 file changed, 1 insertion(+)
 | |
 | |   diff --git a/octopus-a.t b/octopus-a.t
 | |    1 file changed, 1 insertion(+)
 | |
 | |   diff --git a/octopus-a.t b/octopus-a.t


@@ -583,7 +583,7 @@ cat >expect <<\EOF
 |
 |       seventh
 |   ---
 |
 |       seventh
 |   ---

-|    seventh.t |    1 +
+|    seventh.t | 1 +

 |    1 file changed, 1 insertion(+)
 |
 |   diff --git a/seventh.t b/seventh.t
 |    1 file changed, 1 insertion(+)
 |
 |   diff --git a/seventh.t b/seventh.t


@@ -617,7 +617,7 @@ cat >expect <<\EOF
 | | | |
 | | | |     tangle-a
 | | | | ---
 | | | |
 | | | |     tangle-a
 | | | | ---

-| | | |  tangle-a |    1 +
+| | | |  tangle-a | 1 +

 | | | |  1 file changed, 1 insertion(+)
 | | | |
 | | | | diff --git a/tangle-a b/tangle-a
 | | | |  1 file changed, 1 insertion(+)
 | | | |
 | | | | diff --git a/tangle-a b/tangle-a


@@ -639,7 +639,7 @@ cat >expect <<\EOF
 | |/| |
 | | | |       side-2
 | | | |   ---
 | |/| |
 | | | |       side-2
 | | | |   ---

-| | | |    2 |    1 +
+| | | |    2 | 1 +

 | | | |    1 file changed, 1 insertion(+)
 | | | |
 | | | |   diff --git a/2 b/2
 | | | |    1 file changed, 1 insertion(+)
 | | | |
 | | | |   diff --git a/2 b/2


@@ -655,7 +655,7 @@ cat >expect <<\EOF
 | | | |
 | | | |     side-1
 | | | | ---
 | | | |
 | | | |     side-1
 | | | | ---

-| | | |  1 |    1 +
+| | | |  1 | 1 +

 | | | |  1 file changed, 1 insertion(+)
 | | | |
 | | | | diff --git a/1 b/1
 | | | |  1 file changed, 1 insertion(+)
 | | | |
 | | | | diff --git a/1 b/1


@@ -671,7 +671,7 @@ cat >expect <<\EOF
 | | | |
 | | | |     Second
 | | | | ---
 | | | |
 | | | |     Second
 | | | | ---

-| | | |  one |    1 +
+| | | |  one | 1 +

 | | | |  1 file changed, 1 insertion(+)
 | | | |
 | | | | diff --git a/one b/one
 | | | |  1 file changed, 1 insertion(+)
 | | | |
 | | | | diff --git a/one b/one


@@ -687,7 +687,7 @@ cat >expect <<\EOF
 |/| |
 | | |       sixth
 | | |   ---
 |/| |
 | | |       sixth
 | | |   ---

-| | |    a/two |    1 -
+| | |    a/two | 1 -

 | | |    1 file changed, 1 deletion(-)
 | | |
 | | |   diff --git a/a/two b/a/two
 | | |    1 file changed, 1 deletion(-)
 | | |
 | | |   diff --git a/a/two b/a/two


@@ -703,7 +703,7 @@ cat >expect <<\EOF
 | | |
 | | |     fifth
 | | | ---
 | | |
 | | |     fifth
 | | | ---

-| | |  a/two |    1 +
+| | |  a/two | 1 +

 | | |  1 file changed, 1 insertion(+)
 | | |
 | | | diff --git a/a/two b/a/two
 | | |  1 file changed, 1 insertion(+)
 | | |
 | | | diff --git a/a/two b/a/two


@@ -719,7 +719,7 @@ cat >expect <<\EOF
 | |
 | |       fourth
 | |   ---
 | |
 | |       fourth
 | |   ---

-| |    ein |    1 +
+| |    ein | 1 +

 | |    1 file changed, 1 insertion(+)
 | |
 | |   diff --git a/ein b/ein
 | |    1 file changed, 1 insertion(+)
 | |
 | |   diff --git a/ein b/ein


@@ -735,8 +735,8 @@ cat >expect <<\EOF
 |
 |       third
 |   ---
 |
 |       third
 |   ---

-|    ichi |    1 +
-|    one  |    1 -
+|    ichi | 1 +
+|    one  | 1 -

 |    2 files changed, 1 insertion(+), 1 deletion(-)
 |
 |   diff --git a/ichi b/ichi
 |    2 files changed, 1 insertion(+), 1 deletion(-)
 |
 |   diff --git a/ichi b/ichi


@@ -759,7 +759,7 @@ cat >expect <<\EOF
 |
 |     second
 | ---
 |
 |     second
 | ---

-|  one |    2 +-
+|  one | 2 +-

 |  1 file changed, 1 insertion(+), 1 deletion(-)
 |
 | diff --git a/one b/one
 |  1 file changed, 1 insertion(+), 1 deletion(-)
 |
 | diff --git a/one b/one


@@ -775,7 +775,7 @@ cat >expect <<\EOF
 
       initial
   ---
 
       initial
   ---

-   one |    1 +
+   one | 1 +

    1 file changed, 1 insertion(+)
 
   diff --git a/one b/one
    1 file changed, 1 insertion(+)
 
   diff --git a/one b/one

diff --git a/t/t5100/patch0001 b/t/t5100/patch0001
index 8ce155167d51de1868fdd2395c312c46b9cc2c63..02c97746d64fbfe13007a1ab4e9b9e4bbd99f42f 100644 (file)
--- a/t/t5100/patch0001
+++ b/t/t5100/patch0001
@@ -1,5 +1,5 @@
 ---
 ---

- foo |    2 +-
+ foo | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo

diff --git a/t/t5100/patch0002 b/t/t5100/patch0002
index 8ce155167d51de1868fdd2395c312c46b9cc2c63..02c97746d64fbfe13007a1ab4e9b9e4bbd99f42f 100644 (file)
--- a/t/t5100/patch0002
+++ b/t/t5100/patch0002
@@ -1,5 +1,5 @@
 ---
 ---

- foo |    2 +-
+ foo | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo

diff --git a/t/t5100/patch0003 b/t/t5100/patch0003
index 8ce155167d51de1868fdd2395c312c46b9cc2c63..02c97746d64fbfe13007a1ab4e9b9e4bbd99f42f 100644 (file)
--- a/t/t5100/patch0003
+++ b/t/t5100/patch0003
@@ -1,5 +1,5 @@
 ---
 ---

- foo |    2 +-
+ foo | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo

diff --git a/t/t5100/patch0005 b/t/t5100/patch0005
index 7d24b24af83c861a1dc615c19cbaa392fdd69dec..ab7a38373bd857271c4d74d52e8dbda57a964ff3 100644 (file)
--- a/t/t5100/patch0005
+++ b/t/t5100/patch0005
@@ -1,7 +1,7 @@
 ---
 
 ---
 

- Documentation/git-cvsimport-script.txt |    9 ++++++++-
- git-cvsimport-script                   |    4 ++--
+ Documentation/git-cvsimport-script.txt | 9 ++++++++-
+ git-cvsimport-script                   | 4 ++--

  2 files changed, 10 insertions(+), 3 deletions(-)
 
 50452f9c0c2df1f04d83a26266ba704b13861632
  2 files changed, 10 insertions(+), 3 deletions(-)
 
 50452f9c0c2df1f04d83a26266ba704b13861632

diff --git a/t/t5100/patch0006 b/t/t5100/patch0006
index 8ce155167d51de1868fdd2395c312c46b9cc2c63..02c97746d64fbfe13007a1ab4e9b9e4bbd99f42f 100644 (file)
--- a/t/t5100/patch0006
+++ b/t/t5100/patch0006
@@ -1,5 +1,5 @@
 ---
 ---

- foo |    2 +-
+ foo | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo

diff --git a/t/t5100/patch0010 b/t/t5100/patch0010
index f055481d567212b7b43e7ca8251351b3f83b143b..436821c97aa52d7ab599dc43315a0379de32cdb6 100644 (file)
--- a/t/t5100/patch0010
+++ b/t/t5100/patch0010
@@ -1,5 +1,5 @@
 ---
 ---

- builtin-mailinfo.c |    2 +-
+ builtin-mailinfo.c | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c

diff --git a/t/t5100/patch0011 b/t/t5100/patch0011
index 8841d3c13916a85dec9e14762eb1406735f4744e..0988713761d4a6adc1039f8f4edbe77ea58d5ea4 100644 (file)
--- a/t/t5100/patch0011
+++ b/t/t5100/patch0011
@@ -1,5 +1,5 @@
 ---
 ---

- builtin-mailinfo.c  |    4 ++--
+ builtin-mailinfo.c  | 4 ++--

 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
 index 3e5fe51..aabfe5c 100644
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
 index 3e5fe51..aabfe5c 100644

diff --git a/t/t5100/patch0014 b/t/t5100/patch0014
index 124efd234f905c4981718ee7574e213316a31acb..3f3825f9f297983f5270f09971ecef00cac7ae15 100644 (file)
--- a/t/t5100/patch0014
+++ b/t/t5100/patch0014
@@ -1,5 +1,5 @@
 ---
 ---

- builtin-mailinfo.c |   37 ++++++++++++++++++++++++++++++++++++-
+ builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-

  1 files changed, 36 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
  1 files changed, 36 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c

diff --git a/t/t5100/patch0014--scissors b/t/t5100/patch0014--scissors
index 124efd234f905c4981718ee7574e213316a31acb..3f3825f9f297983f5270f09971ecef00cac7ae15 100644 (file)
--- a/t/t5100/patch0014--scissors
+++ b/t/t5100/patch0014--scissors
@@ -1,5 +1,5 @@
 ---
 ---

- builtin-mailinfo.c |   37 ++++++++++++++++++++++++++++++++++++-
+ builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-

  1 files changed, 36 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
  1 files changed, 36 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c

diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox
index de1031241d99a66db0653875ea163785691d12d6..34a09a0fc1c0ca9d1e68ed8bbf56e592c54e7227 100644 (file)
--- a/t/t5100/sample.mbox
+++ b/t/t5100/sample.mbox
@@ -12,7 +12,7 @@ Subject: [PATCH] a commit.
 Here is a patch from A U Thor.
 
 ---
 Here is a patch from A U Thor.
 
 ---

- foo |    2 +-
+ foo | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo


@@ -52,7 +52,7 @@ two truly blank and another full of spaces in between.
 Hope this helps.
 
 ---
 Hope this helps.
 
 ---

- foo |    2 +-
+ foo | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo


@@ -83,7 +83,7 @@ Message-Id: <nitpicker.12121212@example.net>
 Hopefully this would fix the problem stated there.
 
 ---
 Hopefully this would fix the problem stated there.
 
 ---

- foo |    2 +-
+ foo | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo


@@ -249,8 +249,8 @@ actual flags.
 Signed-off-by: David K=E5gedal <davidk@lysator.liu.se>
 ---
 
 Signed-off-by: David K=E5gedal <davidk@lysator.liu.se>
 ---
 

- Documentation/git-cvsimport-script.txt |    9 ++++++++-
- git-cvsimport-script                   |    4 ++--
+ Documentation/git-cvsimport-script.txt | 9 ++++++++-
+ git-cvsimport-script                   | 4 ++--

  2 files changed, 10 insertions(+), 3 deletions(-)
 
 50452f9c0c2df1f04d83a26266ba704b13861632
  2 files changed, 10 insertions(+), 3 deletions(-)
 
 50452f9c0c2df1f04d83a26266ba704b13861632


@@ -379,7 +379,7 @@ Subject: [PATCH] a commit.
 Here is a patch from A U Thor.
 
 ---
 Here is a patch from A U Thor.
 
 ---

- foo |    2 +-
+ foo | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/foo b/foo


@@ -449,7 +449,7 @@ memcmp("Subject: ", header[i], 7) will never match.
 Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
 Signed-off-by: Junio C Hamano <gitster@pobox.com>
 ---
 Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
 Signed-off-by: Junio C Hamano <gitster@pobox.com>
 ---

- builtin-mailinfo.c |    2 +-
+ builtin-mailinfo.c | 2 +-

  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c


@@ -482,7 +482,7 @@ Content-Transfer-Encoding: quoted-printable
 Here comes a commit log message, and
 its second line is here.
 ---
 Here comes a commit log message, and
 its second line is here.
 ---

- builtin-mailinfo.c  |    4 ++--
+ builtin-mailinfo.c  | 4 ++--

 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
 index 3e5fe51..aabfe5c 100644
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
 index 3e5fe51..aabfe5c 100644


@@ -587,7 +587,7 @@ everything before it in the message body.
 
 Signed-off-by: Junio C Hamano <gitster@pobox.com>
 ---
 
 Signed-off-by: Junio C Hamano <gitster@pobox.com>
 ---

- builtin-mailinfo.c |   37 ++++++++++++++++++++++++++++++++++++-
+ builtin-mailinfo.c | 37 ++++++++++++++++++++++++++++++++++++-

  1 files changed, 36 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
  1 files changed, 36 insertions(+), 1 deletions(-)
 
 diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 3b72c097ee0c9538d4e8003639ab7c44126c49d6..955f09f8e818cea8d32e453cd4971ff362d69bea 100755 (executable)
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -54,9 +54,9 @@ Trying simple merge with c2
 Trying simple merge with c3
 Trying simple merge with c4
 Merge made by the 'octopus' strategy.
 Trying simple merge with c3
 Trying simple merge with c4
 Merge made by the 'octopus' strategy.

- c2.c |    1 +
- c3.c |    1 +
- c4.c |    1 +
+ c2.c | 1 +
+ c3.c | 1 +
+ c4.c | 1 +

  3 files changed, 3 insertions(+)
  create mode 100644 c2.c
  create mode 100644 c3.c
  3 files changed, 3 insertions(+)
  create mode 100644 c2.c
  create mode 100644 c3.c


@@ -71,7 +71,7 @@ test_expect_success 'merge output uses pretty names' '
 
 cat >expected <<\EOF
 Merge made by the 'recursive' strategy.
 
 cat >expected <<\EOF
 Merge made by the 'recursive' strategy.

- c5.c |    1 +
+ c5.c | 1 +

  1 file changed, 1 insertion(+)
  create mode 100644 c5.c
 EOF
  1 file changed, 1 insertion(+)
  create mode 100644 c5.c
 EOF


@@ -85,8 +85,8 @@ cat >expected <<\EOF
 Fast-forwarding to: c1
 Trying simple merge with c2
 Merge made by the 'octopus' strategy.
 Fast-forwarding to: c1
 Trying simple merge with c2
 Merge made by the 'octopus' strategy.

- c1.c |    1 +
- c2.c |    1 +
+ c1.c | 1 +
+ c2.c | 1 +

  2 files changed, 2 insertions(+)
  create mode 100644 c1.c
  create mode 100644 c2.c
  2 files changed, 2 insertions(+)
  create mode 100644 c1.c
  create mode 100644 c2.c