1 # This shell script fragment is sourced by git-rebase to implement
2 # its merge-based non-interactive mode that copes well with renamed
5 # Copyright (c) 2010 Junio C Hamano.
11 onto_name
=$
(cat "$state_dir"/onto_name
) &&
12 end
=$
(cat "$state_dir"/end
) &&
13 msgnum
=$
(cat "$state_dir"/msgnum
)
17 test -d "$state_dir" || die
"$state_dir directory does not exist"
19 unmerged
=$
(git ls-files
-u)
20 if test -n "$unmerged"
22 echo "You still have unmerged paths in your index"
23 echo "did you forget to use git add?"
27 cmt
=$
(cat "$state_dir/current")
28 if ! git diff-index
--quiet --ignore-submodules HEAD
--
30 if ! git commit
${gpg_sign_opt:+"$gpg_sign_opt"} $allow_empty_message \
33 echo "Commit failed, please do not call \"git commit\""
34 echo "directly, but instead do one of the following: "
37 if test -z "$GIT_QUIET"
39 printf "Committed: %0${prec}d " $msgnum
41 echo "$cmt $(git rev-parse HEAD^0)" >> "$state_dir/rewritten"
43 if test -z "$GIT_QUIET"
45 printf "Already applied: %0${prec}d " $msgnum
48 test -z "$GIT_QUIET" &&
49 GIT_PAGER
='' git log
--format=%s
-1 "$cmt"
51 # onto the next patch:
52 msgnum
=$
(($msgnum + 1))
53 echo "$msgnum" >"$state_dir/msgnum"
58 echo "$msgnum" >"$state_dir/msgnum"
59 cmt
="$(cat "$state_dir/cmt.
$msgnum")"
60 echo "$cmt" > "$state_dir/current"
61 git update-ref REBASE_HEAD
"$cmt"
62 hd
=$
(git rev-parse
--verify HEAD
)
63 cmt_name
=$
(git symbolic-ref HEAD
2> /dev
/null ||
echo HEAD
)
64 eval GITHEAD_
$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
65 eval GITHEAD_
$hd='$onto_name'
66 export GITHEAD_
$cmt GITHEAD_
$hd
67 if test -n "$GIT_QUIET"
69 GIT_MERGE_VERBOSITY
=1 && export GIT_MERGE_VERBOSITY
71 test -z "$strategy" && strategy
=recursive
72 # If cmt doesn't have a parent, don't include it as a base
73 base
=$
(git rev-parse
--verify --quiet $cmt^
)
74 eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
78 unset GITHEAD_
$cmt GITHEAD_
$hd
82 git rerere
$allow_rerere_autoupdate
86 echo "Strategy: $strategy failed, try another" 1>&2
90 die
"Unknown exit code ($rv) from command:" \
91 "git-merge-$strategy $cmt^ -- HEAD $cmt"
97 move_to_original_branch
98 if test -s "$state_dir"/rewritten
100 git notes copy
--for-rewrite=rebase
<"$state_dir"/rewritten
101 hook
="$(git rev-parse --git-path hooks/post-rewrite)"
102 test -x "$hook" && "$hook" rebase
<"$state_dir"/rewritten
107 # The whole contents of this file is run by dot-sourcing it from
108 # inside a shell function. It used to be that "return"s we see
109 # below were not inside any function, and expected to return
110 # to the function that dot-sourced us.
112 # However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
113 # construct and continue to run the statements that follow such a "return".
114 # As a work-around, we introduce an extra layer of a function
115 # here, and immediately call it after defining it.
116 git_rebase__merge
() {
122 while test "$msgnum" -le "$end"
133 msgnum
=$
(($msgnum + 1))
134 while test "$msgnum" -le "$end"
143 exec git show REBASE_HEAD
--
147 mkdir
-p "$state_dir"
148 echo "$onto_name" > "$state_dir/onto_name"
150 rm -f "$(git rev-parse --git-path REBASE_HEAD)"
153 for cmt
in $
(git rev-list
--reverse --no-merges "$revisions")
155 msgnum
=$
(($msgnum + 1))
156 echo "$cmt" > "$state_dir/cmt.$msgnum"
159 echo 1 >"$state_dir/msgnum"
160 echo $msgnum >"$state_dir/end"
165 while test "$msgnum" -le "$end"
174 # ... and then we call the whole thing.