Use correct grammar in diffstat summary line
"git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
828ea97de4
commit
7f814632f5
@ -1004,7 +1004,7 @@ Updating from ae3a2da... to a80b4aa....
|
||||
Fast-forward (no commit created; -m option ignored)
|
||||
example | 1 +
|
||||
hello | 1 +
|
||||
2 files changed, 2 insertions(+), 0 deletions(-)
|
||||
2 files changed, 2 insertions(+)
|
||||
----------------
|
||||
|
||||
Because your branch did not contain anything more than what had
|
||||
|
@ -34,12 +34,12 @@ $ echo 'hello world' > file.txt
|
||||
$ git add .
|
||||
$ git commit -a -m "initial commit"
|
||||
[master (root-commit) 54196cc] initial commit
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
create mode 100644 file.txt
|
||||
$ echo 'hello world!' >file.txt
|
||||
$ git commit -a -m "add emphasis"
|
||||
[master c4d59f3] add emphasis
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
------------------------------------------------
|
||||
|
||||
What are the 7 digits of hex that git responded to the commit with?
|
||||
|
@ -14,6 +14,7 @@
|
||||
#include "builtin.h"
|
||||
#include "string-list.h"
|
||||
#include "dir.h"
|
||||
#include "diff.h"
|
||||
#include "parse-options.h"
|
||||
|
||||
/*
|
||||
@ -3241,7 +3242,7 @@ static void stat_patch_list(struct patch *patch)
|
||||
show_stats(patch);
|
||||
}
|
||||
|
||||
printf(" %d files changed, %d insertions(+), %d deletions(-)\n", files, adds, dels);
|
||||
print_stat_summary(stdout, files, adds, dels);
|
||||
}
|
||||
|
||||
static void numstat_patch_list(struct patch *patch)
|
||||
|
56
diff.c
56
diff.c
@ -1322,6 +1322,55 @@ static void fill_print_name(struct diffstat_file *file)
|
||||
file->print_name = pname;
|
||||
}
|
||||
|
||||
int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
|
||||
{
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
int ret;
|
||||
|
||||
if (!files) {
|
||||
assert(insertions == 0 && deletions == 0);
|
||||
return fputs(_(" 0 files changed\n"), fp);
|
||||
}
|
||||
|
||||
strbuf_addf(&sb,
|
||||
Q_(" %d file changed", " %d files changed", files),
|
||||
files);
|
||||
|
||||
/*
|
||||
* For binary diff, the caller may want to print "x files
|
||||
* changed" with insertions == 0 && deletions == 0.
|
||||
*
|
||||
* Not omitting "0 insertions(+), 0 deletions(-)" in this case
|
||||
* is probably less confusing (i.e skip over "2 files changed
|
||||
* but nothing about added/removed lines? Is this a bug in Git?").
|
||||
*/
|
||||
if (insertions || deletions == 0) {
|
||||
/*
|
||||
* TRANSLATORS: "+" in (+) is a line addition marker;
|
||||
* do not translate it.
|
||||
*/
|
||||
strbuf_addf(&sb,
|
||||
Q_(", %d insertion(+)", ", %d insertions(+)",
|
||||
insertions),
|
||||
insertions);
|
||||
}
|
||||
|
||||
if (deletions || insertions == 0) {
|
||||
/*
|
||||
* TRANSLATORS: "-" in (-) is a line removal marker;
|
||||
* do not translate it.
|
||||
*/
|
||||
strbuf_addf(&sb,
|
||||
Q_(", %d deletion(-)", ", %d deletions(-)",
|
||||
deletions),
|
||||
deletions);
|
||||
}
|
||||
strbuf_addch(&sb, '\n');
|
||||
ret = fputs(sb.buf, fp);
|
||||
strbuf_release(&sb);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||
{
|
||||
int i, len, add, del, adds = 0, dels = 0;
|
||||
@ -1475,9 +1524,7 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options)
|
||||
extra_shown = 1;
|
||||
}
|
||||
fprintf(options->file, "%s", line_prefix);
|
||||
fprintf(options->file,
|
||||
" %d files changed, %d insertions(+), %d deletions(-)\n",
|
||||
total_files, adds, dels);
|
||||
print_stat_summary(options->file, total_files, adds, dels);
|
||||
}
|
||||
|
||||
static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
|
||||
@ -1507,8 +1554,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option
|
||||
options->output_prefix_data);
|
||||
fprintf(options->file, "%s", msg->buf);
|
||||
}
|
||||
fprintf(options->file, " %d files changed, %d insertions(+), %d deletions(-)\n",
|
||||
total_files, adds, dels);
|
||||
print_stat_summary(options->file, total_files, adds, dels);
|
||||
}
|
||||
|
||||
static void show_numstat(struct diffstat_t *data, struct diff_options *options)
|
||||
|
3
diff.h
3
diff.h
@ -324,4 +324,7 @@ extern struct userdiff_driver *get_textconv(struct diff_filespec *one);
|
||||
|
||||
extern int parse_rename_score(const char **cp_p);
|
||||
|
||||
extern int print_stat_summary(FILE *fp, int files,
|
||||
int insertions, int deletions);
|
||||
|
||||
#endif /* DIFF_H */
|
||||
|
@ -156,7 +156,7 @@ Updating VARIABLE..VARIABLE
|
||||
FASTFORWARD (no commit created; -m option ignored)
|
||||
example | 1 +
|
||||
hello | 1 +
|
||||
2 files changed, 2 insertions(+), 0 deletions(-)
|
||||
2 files changed, 2 insertions(+)
|
||||
EOF
|
||||
|
||||
test_expect_success 'git resolve' '
|
||||
|
@ -167,7 +167,7 @@ test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny' \
|
||||
test_expect_success TABS_IN_FILENAMES 'setup expect' '
|
||||
cat >expected <<\EOF
|
||||
"tabs\t,\" (dq) and spaces"
|
||||
1 files changed, 0 insertions(+), 0 deletions(-)
|
||||
1 file changed, 0 insertions(+), 0 deletions(-)
|
||||
EOF
|
||||
'
|
||||
|
||||
|
@ -38,13 +38,13 @@ test_expect_success 'cherry-pick first..fourth works' '
|
||||
cat <<-\EOF >expected &&
|
||||
[master OBJID] second
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
[master OBJID] third
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
[master OBJID] fourth
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
EOF
|
||||
|
||||
git checkout -f master &&
|
||||
@ -64,15 +64,15 @@ test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
|
||||
Trying simple merge.
|
||||
[master OBJID] second
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
Trying simple merge.
|
||||
[master OBJID] third
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
Trying simple merge.
|
||||
[master OBJID] fourth
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
EOF
|
||||
|
||||
git checkout -f master &&
|
||||
|
@ -444,7 +444,7 @@ test_expect_success 'stash show - stashes on stack, stash-like argument' '
|
||||
git reset --hard &&
|
||||
cat >expected <<-EOF &&
|
||||
file | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
EOF
|
||||
git stash show ${STASH_ID} >actual &&
|
||||
test_cmp expected actual
|
||||
@ -482,7 +482,7 @@ test_expect_success 'stash show - no stashes on stack, stash-like argument' '
|
||||
git reset --hard &&
|
||||
cat >expected <<-EOF &&
|
||||
file | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
EOF
|
||||
git stash show ${STASH_ID} >actual &&
|
||||
test_cmp expected actual
|
||||
|
@ -2,7 +2,7 @@ $ git diff-tree --cc --patch-with-stat --summary master
|
||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --cc dir/sub
|
||||
index cead32e,7289e35..992913c
|
||||
|
@ -3,7 +3,7 @@ c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
|
@ -2,7 +2,7 @@ $ git diff-tree --cc --patch-with-stat master
|
||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --cc dir/sub
|
||||
index cead32e,7289e35..992913c
|
||||
|
@ -2,5 +2,5 @@ $ git diff-tree --cc --stat --summary master
|
||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
$
|
||||
|
@ -3,6 +3,6 @@ c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
$
|
||||
|
@ -2,5 +2,5 @@ $ git diff-tree --cc --stat master
|
||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
$
|
||||
|
@ -3,7 +3,7 @@ $ git diff-tree --pretty=oneline --root --patch-with-stat initial
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
@ -8,5 +8,5 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
$
|
||||
|
@ -3,7 +3,7 @@ $ git diff-tree --root --patch-with-stat initial
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
|
@ -2,5 +2,5 @@ $ git diff-tree -c --stat --summary master
|
||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
$
|
||||
|
@ -3,6 +3,6 @@ c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
$
|
||||
|
@ -2,5 +2,5 @@ $ git diff-tree -c --stat master
|
||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
$
|
||||
|
@ -2,7 +2,7 @@ $ git diff --patch-with-stat -r initial..side
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
|
@ -2,7 +2,7 @@ $ git diff --patch-with-stat initial..side
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
|
@ -2,5 +2,5 @@ $ git diff --stat initial..side
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
$
|
||||
|
@ -2,5 +2,5 @@ $ git diff -r --stat initial..side
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
$
|
||||
|
@ -15,7 +15,7 @@ Content-Transfer-Encoding: 8bit
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
|
||||
|
@ -15,7 +15,7 @@ Content-Transfer-Encoding: 8bit
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
|
||||
@ -124,7 +124,7 @@ Content-Transfer-Encoding: 8bit
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ Content-Transfer-Encoding: 8bit
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
|
||||
|
@ -15,7 +15,7 @@ Content-Transfer-Encoding: 8bit
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
|
||||
|
@ -75,7 +75,7 @@ Subject: [DIFFERENT_PREFIX 2/2] Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
|
@ -53,7 +53,7 @@ Subject: [PATCH] Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -88,7 +88,7 @@ Subject: [PATCH] Side
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
|
@ -53,7 +53,7 @@ Subject: [PATCH 2/3] Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -88,7 +88,7 @@ Subject: [PATCH 3/3] Side
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
|
@ -53,7 +53,7 @@ Subject: [PATCH 2/3] Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -88,7 +88,7 @@ Subject: [PATCH 3/3] Side
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
|
@ -53,7 +53,7 @@ Subject: [PATCH 2/2] Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
|
@ -8,7 +8,7 @@ Subject: [PATCH] Side
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
|
@ -13,7 +13,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
@ -32,7 +32,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
@ -54,7 +54,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
This is the second commit.
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
|
@ -15,7 +15,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
@ -56,7 +56,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
|
@ -13,7 +13,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
@ -32,7 +32,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
@ -54,7 +54,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
This is the second commit.
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --cc dir/sub
|
||||
index cead32e,7289e35..992913c
|
||||
@ -47,7 +47,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -89,7 +89,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -165,7 +165,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
@ -15,7 +15,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -57,7 +57,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -133,7 +133,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
@ -15,7 +15,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
@ -56,7 +56,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
@ -130,7 +130,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --combined dir/sub
|
||||
index cead32e,7289e35..992913c
|
||||
@ -47,7 +47,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -89,7 +89,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -165,7 +165,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
|
@ -8,6 +8,6 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
$
|
||||
|
@ -8,5 +8,5 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
$
|
||||
|
@ -6,7 +6,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
@ -25,7 +25,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
@ -47,7 +47,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
This is the second commit.
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
@ -49,7 +49,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
|
@ -6,7 +6,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
@ -25,7 +25,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
@ -47,7 +47,7 @@ Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
This is the second commit.
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --cc dir/sub
|
||||
index cead32e,7289e35..992913c
|
||||
@ -47,7 +47,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -89,7 +89,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -165,7 +165,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -50,7 +50,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -126,7 +126,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
@ -49,7 +49,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
@ -123,7 +123,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
|
@ -8,7 +8,7 @@ Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --combined dir/sub
|
||||
index cead32e,7289e35..992913c
|
||||
@ -47,7 +47,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
3 files changed, 9 insertions(+)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -89,7 +89,7 @@ Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
2 files changed, 5 insertions(+)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
@ -165,7 +165,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
3 files changed, 8 insertions(+)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
@ -520,7 +520,7 @@ test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
|
||||
cat > expect << EOF
|
||||
---
|
||||
file | 16 ++++++++++++++++
|
||||
1 files changed, 16 insertions(+), 0 deletions(-)
|
||||
1 file changed, 16 insertions(+)
|
||||
|
||||
diff --git a/file b/file
|
||||
index 40f36c6..2dc5c23 100644
|
||||
|
@ -86,7 +86,7 @@ test_expect_success 'status -v produces text' '
|
||||
|
||||
cat >expect.stat <<'EOF'
|
||||
file | Bin 2 -> 4 bytes
|
||||
1 files changed, 0 insertions(+), 0 deletions(-)
|
||||
1 file changed, 0 insertions(+), 0 deletions(-)
|
||||
EOF
|
||||
test_expect_success 'diffstat does not run textconv' '
|
||||
echo file diff=fail >.gitattributes &&
|
||||
|
@ -33,7 +33,7 @@ check_stat() {
|
||||
expect=$1; shift
|
||||
cat >expected <<EOF
|
||||
$expect | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
EOF
|
||||
test_expect_success "--stat $*" "
|
||||
git diff --stat $* HEAD^ >actual &&
|
||||
|
@ -16,7 +16,7 @@ test_expect_success setup '
|
||||
cat >expect <<-\EOF
|
||||
a | 1 +
|
||||
b | 1 +
|
||||
2 files changed, 2 insertions(+), 0 deletions(-)
|
||||
2 files changed, 2 insertions(+)
|
||||
EOF
|
||||
git diff --stat --stat-count=2 >actual &&
|
||||
test_cmp expect actual
|
||||
|
@ -1,2 +1,2 @@
|
||||
t/t4100-apply-stat.sh | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
@ -1,2 +1,2 @@
|
||||
t/t4100-apply-stat.sh | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
@ -95,7 +95,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '
|
||||
b
|
||||
: diffstat
|
||||
n
|
||||
/ [0-9]* files changed/ {
|
||||
/ [0-9]* files* changed/ {
|
||||
a\\
|
||||
DIFFSTAT
|
||||
b
|
||||
|
@ -57,7 +57,7 @@ Merge made by the 'octopus' strategy.
|
||||
c2.c | 1 +
|
||||
c3.c | 1 +
|
||||
c4.c | 1 +
|
||||
3 files changed, 3 insertions(+), 0 deletions(-)
|
||||
3 files changed, 3 insertions(+)
|
||||
create mode 100644 c2.c
|
||||
create mode 100644 c3.c
|
||||
create mode 100644 c4.c
|
||||
@ -74,7 +74,7 @@ Already up-to-date with c4
|
||||
Trying simple merge with c5
|
||||
Merge made by the 'octopus' strategy.
|
||||
c5.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
1 file changed, 1 insertion(+)
|
||||
create mode 100644 c5.c
|
||||
EOF
|
||||
|
||||
@ -89,7 +89,7 @@ Trying simple merge with c2
|
||||
Merge made by the 'octopus' strategy.
|
||||
c1.c | 1 +
|
||||
c2.c | 1 +
|
||||
2 files changed, 2 insertions(+), 0 deletions(-)
|
||||
2 files changed, 2 insertions(+)
|
||||
create mode 100644 c1.c
|
||||
create mode 100644 c2.c
|
||||
EOF
|
||||
|
Loading…
Reference in New Issue
Block a user