diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-04 05:56:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-04 05:56:59 (GMT) |
| commit | e2b1accc59ab5d682d71fd801ebe959c3e871488 (patch) | |
| tree | fe7ff753798566ed54d2ac8af556ccc58cb4f471 /t | |
| parent | f6b78c6eb626d477b252d39ef2801d4670675a2b (diff) | |
| parent | ed5f07a6fdc5653e24a5bd6c216d12bc878496bd (diff) | |
| download | git-e2b1accc59ab5d682d71fd801ebe959c3e871488.zip git-e2b1accc59ab5d682d71fd801ebe959c3e871488.tar.gz git-e2b1accc59ab5d682d71fd801ebe959c3e871488.tar.bz2 | |
Merge branch 'maint'
* maint:
Document -<n> for git-format-patch
glossary: add 'reflog'
diff --no-index: fix --name-status with added files
Don't smash stack when $GIT_ALTERNATE_OBJECT_DIRECTORIES is too long
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 | ||||
| -rw-r--r-- | t/t4013/diff.diff_--name-status_dir2_dir | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index b453b42..9eec754 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -17,6 +17,7 @@ test_expect_success setup ' export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && mkdir dir && + mkdir dir2 && for i in 1 2 3; do echo $i; done >file0 && for i in A B; do echo $i; done >dir/sub && cat file0 >file2 && @@ -254,6 +255,7 @@ diff --patch-with-stat initial..side diff --patch-with-raw initial..side diff --patch-with-stat -r initial..side diff --patch-with-raw -r initial..side +diff --name-status dir2 dir EOF test_done diff --git a/t/t4013/diff.diff_--name-status_dir2_dir b/t/t4013/diff.diff_--name-status_dir2_dir new file mode 100644 index 0000000..ef7fdb7 --- /dev/null +++ b/t/t4013/diff.diff_--name-status_dir2_dir @@ -0,0 +1,3 @@ +$ git diff --name-status dir2 dir +A dir/sub +$ |