mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-rebase--merge: modernize "git-$cmd" to "git $cmd"

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2018-06-27 00:46:00 -07:00
committed by Junio C Hamano
parent 0060041df1
commit d7f590be84
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--merge.sh
View File

@ -71,7 +71,7 @@ call_merge () {
test -z "$strategy" && strategy=recursive test -z "$strategy" && strategy=recursive
# If cmt doesn't have a parent, don't include it as a base # If cmt doesn't have a parent, don't include it as a base
base=$(git rev-parse --verify --quiet $cmt^) base=$(git rev-parse --verify --quiet $cmt^)
eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"' eval 'git merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
rv=$? rv=$?
case "$rv" in case "$rv" in
0) 0)
@ -88,7 +88,7 @@ call_merge () {
;; ;;
*) *)
die "Unknown exit code ($rv) from command:" \ die "Unknown exit code ($rv) from command:" \
"git-merge-$strategy $cmt^ -- HEAD $cmt" "git merge-$strategy $cmt^ -- HEAD $cmt"
;; ;;
esac esac
} }