diff options
| author | Avery Pennarun <apenwarr@gmail.com> | 2009-11-26 02:23:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 06:45:17 (GMT) |
| commit | ee2c79552acceaa59a78518c6c084bd515606374 (patch) | |
| tree | c8346d5dd29f924fdb136b8a1f55ae46aed641e9 /t/t6037-merge-ours-theirs.sh | |
| parent | 8cc5b29065e19267cbc08b39c34674b02c2e3d59 (diff) | |
| download | git-ee2c79552acceaa59a78518c6c084bd515606374.zip git-ee2c79552acceaa59a78518c6c084bd515606374.tar.gz git-ee2c79552acceaa59a78518c6c084bd515606374.tar.bz2 | |
Teach git-pull to pass -X<option> to git-merge
This needs the usual sq then eval trick to allow IFS characters
in the option.
Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
| -rwxr-xr-x | t/t6037-merge-ours-theirs.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh index 08c9f79..8ab3d61 100755 --- a/t/t6037-merge-ours-theirs.sh +++ b/t/t6037-merge-ours-theirs.sh @@ -53,4 +53,12 @@ test_expect_success 'recursive favouring ours' ' ! grep 1 file ' +test_expect_success 'pull with -X' ' + git reset --hard master && git pull -s recursive -Xours . side && + git reset --hard master && git pull -s recursive -X ours . side && + git reset --hard master && git pull -s recursive -Xtheirs . side && + git reset --hard master && git pull -s recursive -X theirs . side && + git reset --hard master && ! git pull -s recursive -X bork . side +' + test_done |