kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

Add --no-commit to git-merge/git-pull. 

With --no-commit flag, git-pull will perform the merge but pretends as
if the merge needed a hand resolve even if automerge cleanly resolves,
to give the user a chance to add further changes and edit the commit
message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 20 years ago
parent
a3114b3428
commit
123ee3ca7b
2 changed files with 22 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      git-merge.sh
  2. 6
      git-pull.sh

28
git-merge.sh
Unescape View File

@ -9,7 +9,7 @@ LF='
' '


usage () { usage () {
die "git-merge [-n] [-s <strategy>]... <merge-message> <head> <remote>+" die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
} }


# all_strategies='resolve recursive stupid octopus' # all_strategies='resolve recursive stupid octopus'
@ -63,6 +63,8 @@ do
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary) --no-summa|--no-summar|--no-summary)
no_summary=t ;; no_summary=t ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=t ;;
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
--strateg=*|--strategy=*|\ --strateg=*|--strategy=*|\
-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
@ -111,18 +113,18 @@ done
common=$(git-show-branch --merge-base $head "$@") common=$(git-show-branch --merge-base $head "$@")
echo "$head" >"$GIT_DIR/ORIG_HEAD" echo "$head" >"$GIT_DIR/ORIG_HEAD"


case "$#,$common" in case "$#,$common,$no_commit" in
*,'') *,'',*)
# No common ancestors found. We need a real merge. # No common ancestors found. We need a real merge.
;; ;;
1,"$1") 1,"$1",*)
# If head can reach all the merge then we are up to date. # If head can reach all the merge then we are up to date.
# but first the most common case of merging one remote # but first the most common case of merging one remote
echo "Already up-to-date." echo "Already up-to-date."
dropsave dropsave
exit 0 exit 0
;; ;;
1,"$head") 1,"$head",*)
# Again the most common case of merging one remote. # Again the most common case of merging one remote.
echo "Updating from $head to $1." echo "Updating from $head to $1."
git-update-index --refresh 2>/dev/null git-update-index --refresh 2>/dev/null
@ -132,11 +134,11 @@ case "$#,$common" in
dropsave dropsave
exit 0 exit 0
;; ;;
1,?*"$LF"?*) 1,?*"$LF"?*,*)
# We are not doing octopus and not fast forward. Need a # We are not doing octopus and not fast forward. Need a
# real merge. # real merge.
;; ;;
1,*) 1,*,)
# We are not doing octopus, not fast forward, and have only # We are not doing octopus, not fast forward, and have only
# one common. See if it is really trivial. # one common. See if it is really trivial.
echo "Trying really trivial in-index merge..." echo "Trying really trivial in-index merge..."
@ -210,12 +212,18 @@ do
# Remember which strategy left the state in the working tree # Remember which strategy left the state in the working tree
wt_strategy=$strategy wt_strategy=$strategy


git-merge-$strategy $common -- "$head_arg" "$@" || { git-merge-$strategy $common -- "$head_arg" "$@"
exit=$?
if test "$no_commit" = t && test "$exit" = 0
then
exit=1 ;# pretend it left conflicts.
fi

test "$exit" = 0 || {


# The backend exits with 1 when conflicts are left to be resolved, # The backend exits with 1 when conflicts are left to be resolved,
# with 2 when it does not handle the given merge at all. # with 2 when it does not handle the given merge at all.


exit=$?
if test "$exit" -eq 1 if test "$exit" -eq 1
then then
cnt=`{ cnt=`{
@ -272,4 +280,4 @@ do
done >"$GIT_DIR/MERGE_HEAD" done >"$GIT_DIR/MERGE_HEAD"
echo $merge_msg >"$GIT_DIR/MERGE_MSG" echo $merge_msg >"$GIT_DIR/MERGE_MSG"


die "Automatic merge failed; fix up by hand" die "Automatic merge failed/prevented; fix up by hand"

6
git-pull.sh
Unescape View File

@ -10,13 +10,15 @@ usage () {
die "git pull [-n] [-s strategy]... <repo> <head>..." die "git pull [-n] [-s strategy]... <repo> <head>..."
} }


strategy_args= no_summary= strategy_args= no_summary= no_commit=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
do do
case "$1" in case "$1" in
-n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\
--no-summa|--no-summar|--no-summary) --no-summa|--no-summar|--no-summary)
no_summary=-n ;; no_summary=-n ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=--no-commit ;;
-s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\
--strateg=*|--strategy=*|\ --strateg=*|--strategy=*|\
-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
@ -81,4 +83,4 @@ case "$strategy_args" in
esac esac


merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head

Write Preview
Loading…
Cancel
Save