diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 16:49:19 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 16:49:19 (GMT) |
| commit | ed520a8f270253f4a779aece1352b10fb9a689de (patch) | |
| tree | d4e6f8d587781821b9d642ef23c7d60abaa2068e /t/t6026-merge-attr.sh | |
| parent | 1ad6d46235d135582d5cbb91ec0186b485c7b5c1 (diff) | |
| parent | 4271666046b4b3e655eab88821096539099f3b14 (diff) | |
| download | git-ed520a8f270253f4a779aece1352b10fb9a689de.zip git-ed520a8f270253f4a779aece1352b10fb9a689de.tar.gz git-ed520a8f270253f4a779aece1352b10fb9a689de.tar.bz2 | |
Merge branch 'mv/merge-recursive'
* mv/merge-recursive:
builtin-merge: release the lockfile in try_merge_strategy()
merge-recursive: get rid of virtual_id
merge-recursive: move current_{file,directory}_set to struct merge_options
merge-recursive: move the global obuf to struct merge_options
merge-recursive: get rid of the index_only global variable
merge-recursive: move call_depth to struct merge_options
cherry-pick/revert: make direct internal call to merge_tree()
builtin-merge: avoid run_command_v_opt() for recursive and subtree
merge-recursive: introduce merge_options
merge-recursive.c: Add more generic merge_recursive_generic()
Split out merge_recursive() to merge-recursive.c
Diffstat (limited to 't/t6026-merge-attr.sh')
| -rwxr-xr-x | t/t6026-merge-attr.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 4b423e9..1ba0a25 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -142,4 +142,26 @@ test_expect_success 'custom merge backend' ' rm -f $o $a $b ' +test_expect_success 'up-to-date merge without common ancestor' ' + test_create_repo repo1 && + test_create_repo repo2 && + test_tick && + ( + cd repo1 && + >a && + git add a && + git commit -m initial + ) && + test_tick && + ( + cd repo2 && + git commit --allow-empty -m initial + ) && + test_tick && + ( + cd repo1 && + git pull ../repo2 master + ) +' + test_done |