From 61010f94d530ba22d2f73f99eaace9c1eb061dde Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Sun, 9 Jun 2013 14:24:49 -0500 Subject: [PATCH] rebase: remove merge mode The cherrypick mode does the job. Signed-off-by: Felipe Contreras --- .gitignore | 1 - Makefile | 1 - git-rebase--interactive.sh | 2 +- git-rebase--merge.sh | 153 ------------------------------ git-rebase.sh | 13 +-- t/t3406-rebase-message.sh | 14 +-- t/t3425-rebase-topology-merges.sh | 9 +- t/t9903-bash-prompt.sh | 2 +- 8 files changed, 7 insertions(+), 188 deletions(-) delete mode 100644 git-rebase--merge.sh diff --git a/.gitignore b/.gitignore index dd9bf56a57..cc0740d74c 100644 --- a/.gitignore +++ b/.gitignore @@ -115,7 +115,6 @@ /git-rebase--am /git-rebase--cherrypick /git-rebase--interactive -/git-rebase--merge /git-receive-pack /git-reflog /git-relink diff --git a/Makefile b/Makefile index 278fc783b9..6a7970f332 100644 --- a/Makefile +++ b/Makefile @@ -473,7 +473,6 @@ SCRIPT_LIB += git-parse-remote SCRIPT_LIB += git-rebase--am SCRIPT_LIB += git-rebase--cherrypick SCRIPT_LIB += git-rebase--interactive -SCRIPT_LIB += git-rebase--merge SCRIPT_LIB += git-sh-setup SCRIPT_LIB += git-sh-i18n diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index fd085e18af..c6cdf12ba8 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -78,7 +78,7 @@ rewritten_list="$state_dir"/rewritten-list rewritten_pending="$state_dir"/rewritten-pending strategy_args= -if test -n "$do_merge" +if test -n "$strategy" then strategy_args=${strategy:+--strategy=$strategy} eval ' diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh deleted file mode 100644 index e7d96de9ad..0000000000 --- a/git-rebase--merge.sh +++ /dev/null @@ -1,153 +0,0 @@ -# This shell script fragment is sourced by git-rebase to implement -# its merge-based non-interactive mode that copes well with renamed -# files. -# -# Copyright (c) 2010 Junio C Hamano. -# - -prec=4 - -read_state () { - onto_name=$(cat "$state_dir"/onto_name) && - end=$(cat "$state_dir"/end) && - msgnum=$(cat "$state_dir"/msgnum) -} - -continue_merge () { - test -d "$state_dir" || die "$state_dir directory does not exist" - - unmerged=$(git ls-files -u) - if test -n "$unmerged" - then - echo "You still have unmerged paths in your index" - echo "did you forget to use git add?" - die "$resolvemsg" - fi - - cmt=`cat "$state_dir/current"` - if ! git diff-index --quiet --ignore-submodules HEAD -- - then - if ! git commit --no-verify -C "$cmt" - then - echo "Commit failed, please do not call \"git commit\"" - echo "directly, but instead do one of the following: " - die "$resolvemsg" - fi - if test -z "$GIT_QUIET" - then - printf "Committed: %0${prec}d " $msgnum - fi - echo "$cmt $(git rev-parse HEAD^0)" >> "$state_dir/rewritten" - else - if test -z "$GIT_QUIET" - then - printf "Already applied: %0${prec}d " $msgnum - fi - fi - test -z "$GIT_QUIET" && - GIT_PAGER='' git log --format=%s -1 "$cmt" - - # onto the next patch: - msgnum=$(($msgnum + 1)) - echo "$msgnum" >"$state_dir/msgnum" -} - -call_merge () { - cmt="$(cat "$state_dir/cmt.$1")" - echo "$cmt" > "$state_dir/current" - hd=$(git rev-parse --verify HEAD) - cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD) - msgnum=$(cat "$state_dir/msgnum") - eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"' - eval GITHEAD_$hd='$onto_name' - export GITHEAD_$cmt GITHEAD_$hd - if test -n "$GIT_QUIET" - then - GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY - fi - test -z "$strategy" && strategy=recursive - eval 'git-merge-$strategy' $strategy_opts '"$cmt^" -- "$hd" "$cmt"' - rv=$? - case "$rv" in - 0) - unset GITHEAD_$cmt GITHEAD_$hd - return - ;; - 1) - git rerere $allow_rerere_autoupdate - die "$resolvemsg" - ;; - 2) - echo "Strategy: $strategy failed, try another" 1>&2 - die "$resolvemsg" - ;; - *) - die "Unknown exit code ($rv) from command:" \ - "git-merge-$strategy $cmt^ -- HEAD $cmt" - ;; - esac -} - -finish_rb_merge () { - move_to_original_branch - if test -s "$state_dir"/rewritten - then - git notes copy --for-rewrite=rebase <"$state_dir"/rewritten - if test -x "$GIT_DIR"/hooks/post-rewrite - then - "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten - fi - fi - say All done. -} - -case "$action" in -continue) - read_state - continue_merge - while test "$msgnum" -le "$end" - do - call_merge "$msgnum" - continue_merge - done - finish_rb_merge - return - ;; -skip) - read_state - git rerere clear - msgnum=$(($msgnum + 1)) - while test "$msgnum" -le "$end" - do - call_merge "$msgnum" - continue_merge - done - finish_rb_merge - return - ;; -esac - -mkdir -p "$state_dir" -echo "$onto_name" > "$state_dir/onto_name" -write_basic_state - -msgnum=0 -for cmt in `git rev-list --reverse --no-merges "$revisions"` -do - msgnum=$(($msgnum + 1)) - echo "$cmt" > "$state_dir/cmt.$msgnum" -done - -echo 1 >"$state_dir/msgnum" -echo $msgnum >"$state_dir/end" - -end=$msgnum -msgnum=1 - -while test "$msgnum" -le "$end" -do - call_merge "$msgnum" - continue_merge -done - -finish_rb_merge diff --git a/git-rebase.sh b/git-rebase.sh index 16b214136a..305c653a57 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -60,7 +60,6 @@ unset onto cmd= strategy= strategy_opts= -do_merge= merge_dir="$GIT_DIR"/rebase-merge apply_dir="$GIT_DIR"/rebase-apply verbose= @@ -215,11 +214,8 @@ then then type=interactive interactive_rebase=explicit - elif test -f "$merge_dir"/cherrypick - then - type=cherrypick else - type=merge + type=cherrypick fi state_dir="$merge_dir" fi @@ -272,18 +268,15 @@ do fork_point= ;; -M|-m) - do_merge=t ;; -X) shift strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--$1")" - do_merge=t test -z "$strategy" && strategy=recursive ;; -s) shift strategy="$1" - do_merge=t ;; -n) diffstat= @@ -428,10 +421,6 @@ if test -n "$interactive_rebase" then type=interactive state_dir="$merge_dir" -elif test -n "$do_merge" -then - type=merge - state_dir="$merge_dir" elif test -n "$git_am_opt" then type=am diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 0392e36d23..730e5039c3 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -17,20 +17,8 @@ test_expect_success 'setup' ' git tag start ' -cat >expect <<\EOF -Already applied: 0001 A -Already applied: 0002 B -Committed: 0003 Z -EOF - -test_expect_success 'rebase -m' ' - git rebase -m master >report && - sed -n -e "/^Already applied: /p" \ - -e "/^Committed: /p" report >actual && - test_cmp expect actual -' - test_expect_success 'rebase against master twice' ' + git rebase master && git rebase master >out && test_i18ngrep "Current branch topic is up to date" out ' diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh index 99b4535270..9cd34802ad 100755 --- a/t/t3425-rebase-topology-merges.sh +++ b/t/t3425-rebase-topology-merges.sh @@ -70,9 +70,8 @@ test_run_rebase () { test_linear_range "\'"$expected"\'" d.. " } -#TODO: make order consistent across all flavors of rebase test_run_rebase success 'n o e' '' -test_run_rebase success 'e n o' -m +test_run_rebase success 'n o e' -m test_run_rebase success 'n o e' -i test_run_rebase () { @@ -87,9 +86,8 @@ test_run_rebase () { test_linear_range "\'"$expected"\'" c.. " } -#TODO: make order consistent across all flavors of rebase test_run_rebase success 'd n o e' '' -test_run_rebase success 'd e n o' -m +test_run_rebase success 'd n o e' -m test_run_rebase success 'd n o e' -i test_run_rebase () { @@ -104,9 +102,8 @@ test_run_rebase () { test_linear_range "\'"$expected"\'" c.. " } -#TODO: make order consistent across all flavors of rebase test_run_rebase success 'd n o e' '' -test_run_rebase success 'd e n o' -m +test_run_rebase success 'd n o e' -m test_run_rebase success 'd n o e' -i test_expect_success "rebase -p is no-op in non-linear history" " diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 59f875e830..f411242f75 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -181,7 +181,7 @@ test_expect_success 'prompt - interactive rebase' ' ' test_expect_success 'prompt - rebase merge' ' - printf " (b2|REBASE-m 1/3)" >expected && + printf " (b2|REBASE 1/3)" > expected && git checkout b2 && test_when_finished "git checkout master" && test_must_fail git rebase --merge b1 b2 && -- 2.32.0.93.g670b81a890