diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
| commit | 28c8a447dd4d6420fc08106efa1c288246b15845 (patch) | |
| tree | c1c40e1070da9044ca23ab7250ce1d6be868949b /t/t4013/diff.diff_--raw_--no-abbrev_initial | |
| parent | Merge branch 'jk/stash-disable-renames-internally' into maint (diff) | |
| parent | diff: handle --no-abbrev in no-index case (diff) | |
| download | tgif-28c8a447dd4d6420fc08106efa1c288246b15845.tar.xz | |
Merge branch 'jb/diff-no-index-no-abbrev' into maint
"git diff --no-index" did not take "--no-abbrev" option.
* jb/diff-no-index-no-abbrev:
diff: handle --no-abbrev in no-index case
Diffstat (limited to 't/t4013/diff.diff_--raw_--no-abbrev_initial')
| -rw-r--r-- | t/t4013/diff.diff_--raw_--no-abbrev_initial | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--raw_--no-abbrev_initial b/t/t4013/diff.diff_--raw_--no-abbrev_initial new file mode 100644 index 0000000000..c87a1258e3 --- /dev/null +++ b/t/t4013/diff.diff_--raw_--no-abbrev_initial @@ -0,0 +1,6 @@ +$ git diff --raw --no-abbrev initial +:100644 100644 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 M dir/sub +:100644 100644 01e79c32a8c99c557f0757da7cb6d65b3414466d 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M file0 +:000000 100644 0000000000000000000000000000000000000000 b1e67221afe8461efd244b487afca22d46b95eb8 A file1 +:100644 000000 01e79c32a8c99c557f0757da7cb6d65b3414466d 0000000000000000000000000000000000000000 D file2 +$ |