diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-03 00:50:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-03 00:50:05 -0700 |
| commit | b11cf09043f18b368ec0d988f064ea21247c843d (patch) | |
| tree | 864a5086870ab9f5e48b3f6e2d5fa1264e9f074a /t | |
| parent | Clean up and simplify rev_compare_tree() (diff) | |
| parent | diff: generate pretty filenames in prep_temp_blob() (diff) | |
| download | tgif-b11cf09043f18b368ec0d988f064ea21247c843d.tar.xz | |
Merge branch 'da/pretty-tempname'
* da/pretty-tempname:
diff: generate pretty filenames in prep_temp_blob()
compat: add a basename() compatibility function
compat: add a mkstemps() compatibility function
Conflicts:
Makefile
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4020-diff-external.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index 0720001281..4ea42e00da 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -136,6 +136,15 @@ test_expect_success 'GIT_EXTERNAL_DIFF with more than one changed files' ' GIT_EXTERNAL_DIFF=echo git diff ' +test_expect_success 'GIT_EXTERNAL_DIFF generates pretty paths' ' + touch file.ext && + git add file.ext && + echo with extension > file.ext && + GIT_EXTERNAL_DIFF=echo git diff file.ext | grep ......_file\.ext && + git update-index --force-remove file.ext && + rm file.ext +' + echo "#!$SHELL_PATH" >fake-diff.sh cat >> fake-diff.sh <<\EOF cat $2 >> crlfed.txt |