undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-pull.sh: Fix call to git-merge for new command format

Browse Source 
Now "git merge <msg> HEAD" is officially deprecated, we should
clean our own use as well.

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Horst H. von Brand 2009-12-01 19:44:11 -03:00 committed by Junio C Hamano
parent 0748494e86
commit c0ecb07048
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-pull.sh
View File

@ -216,7 +216,7 @@ fi
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
test true = "$rebase" && test true = "$rebase" &&
exec git-rebase $diffstat $strategy_args --onto $merge_head \ exec git rebase $diffstat $strategy_args --onto $merge_head \
${oldremoteref:-$merge_head} ${oldremoteref:-$merge_head}
exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \ exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
"$merge_name" HEAD $merge_head $verbosity -m "$merge_name" $merge_head