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>
Avery Pennarun committed
Nov 25, 2009 at 21:23 UTC
ee2c79552acceaa59a78518c6c084bd515606374
2 files changed
+23
-2
git-pull.sh
+15
-2
@@ -18,6 +18,7 @@ test -z "$(git ls-files -u)" ||
18
19
strategy_args= diffstat= no_commit= squash= no_ff= ff_only=
20
log_arg= verbosity=
21
+merge_args=
22
curr_branch=$(git symbolic-ref -q HEAD)
23
curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
24
rebase=$(git config --bool branch.$curr_branch_short.rebase)
@@ -62,6 +63,18 @@ do
63
esac
64
strategy_args="${strategy_args}-s $strategy "
65
;;
66
+ -X*)
67
+ case "$#,$1" in
68
+ 1,-X)
69
+ usage ;;
70
+ *,-X)
71
+ xx="-X $2"
72
+ shift ;;
73
+ *,*)
74
+ xx="$1" ;;
75
+ esac
76
+ merge_args="$merge_args$xx "
77
+ ;;
78
-r|--r|--re|--reb|--reba|--rebas|--rebase)
79
rebase=true
80
;;
@@ -216,7 +229,7 @@ fi
229
230
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
231
test true = "$rebase" &&
219
- exec git-rebase $diffstat $strategy_args --onto $merge_head \
232
+ exec git-rebase $diffstat $strategy_args $merge_args --onto $merge_head \
233
${oldremoteref:-$merge_head}
221
-exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
234
+exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args $merge_args \
235
"$merge_name" HEAD $merge_head $verbosity
t/t6037-merge-ours-theirs.sh
+8
@@ -53,4 +53,12 @@ test_expect_success 'recursive favouring ours' '
53
! grep 1 file
54
'
55
56
+test_expect_success 'pull with -X' '
57
+ git reset --hard master && git pull -s recursive -Xours . side &&
58
+ git reset --hard master && git pull -s recursive -X ours . side &&
59
+ git reset --hard master && git pull -s recursive -Xtheirs . side &&
60
+ git reset --hard master && git pull -s recursive -X theirs . side &&
61
+ git reset --hard master && ! git pull -s recursive -X bork . side
62
+'
63
+
64
test_done