diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-03 00:49:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-03 00:49:40 -0700 |
| commit | 433e972aeb5e485d2f7a7ac605a1c043822e25d9 (patch) | |
| tree | 53d39fd7fdbd01c870d08937e805849dd4d6c404 /t | |
| parent | a5adcbe377de7c8f5d794fce1fe2b23a0bddf758 (diff) | |
| parent | a9b2d42486ee0b461220bf3895114926d9ddf9be (diff) | |
| download | git-433e972aeb5e485d2f7a7ac605a1c043822e25d9.tar.gz git-433e972aeb5e485d2f7a7ac605a1c043822e25d9.tar.xz | |
Merge branch 'maint'
* maint:
blame: correctly handle a path that used to be a directory
add -i: do not dump patch during application
Update draft release notes for 1.6.3.2
grep: fix colouring of matches with zero length
Documentation: teach stash/pop workflow instead of stash/apply
Change xdl_merge to generate output even for null merges
t6023: merge-file fails to output anything for a degenerate merge
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6023-merge-file.sh | 6 | ||||
| -rwxr-xr-x | t/t8003-blame.sh | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index f8942bc89..7dcf39191 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -54,6 +54,12 @@ deduxit me super semitas jusitiae, EOF printf "propter nomen suum." >> new4.txt +test_expect_success 'merge with no changes' ' + cp orig.txt test.txt && + git merge-file test.txt orig.txt orig.txt && + test_cmp test.txt orig.txt +' + cp new1.txt test.txt test_expect_success "merge without conflict" \ "git merge-file test.txt orig.txt new2.txt" diff --git a/t/t8003-blame.sh b/t/t8003-blame.sh index 966bb0a61..13c25f1d5 100755 --- a/t/t8003-blame.sh +++ b/t/t8003-blame.sh @@ -129,4 +129,19 @@ test_expect_success 'blame wholesale copy and more' ' ' +test_expect_success 'blame path that used to be a directory' ' + mkdir path && + echo A A A A A >path/file && + echo B B B B B >path/elif && + git add path && + test_tick && + git commit -m "path was a directory" && + rm -fr path && + echo A A A A A >path && + git add path && + test_tick && + git commit -m "path is a regular file" && + git blame HEAD^.. -- path +' + test_done |