Start preparing for 1.8.4.2
[alt-git.git] / git-rebase--merge.sh
blob16d18176ece5eecf4a3b0b0a9dea0a5b41ac43d4
1 #!/bin/sh
3 # Copyright (c) 2010 Junio C Hamano.
6 prec=4
8 read_state () {
9 onto_name=$(cat "$state_dir"/onto_name) &&
10 end=$(cat "$state_dir"/end) &&
11 msgnum=$(cat "$state_dir"/msgnum)
14 continue_merge () {
15 test -d "$state_dir" || die "$state_dir directory does not exist"
17 unmerged=$(git ls-files -u)
18 if test -n "$unmerged"
19 then
20 echo "You still have unmerged paths in your index"
21 echo "did you forget to use git add?"
22 die "$resolvemsg"
25 cmt=`cat "$state_dir/current"`
26 if ! git diff-index --quiet --ignore-submodules HEAD --
27 then
28 if ! git commit --no-verify -C "$cmt"
29 then
30 echo "Commit failed, please do not call \"git commit\""
31 echo "directly, but instead do one of the following: "
32 die "$resolvemsg"
34 if test -z "$GIT_QUIET"
35 then
36 printf "Committed: %0${prec}d " $msgnum
38 echo "$cmt $(git rev-parse HEAD^0)" >> "$state_dir/rewritten"
39 else
40 if test -z "$GIT_QUIET"
41 then
42 printf "Already applied: %0${prec}d " $msgnum
45 test -z "$GIT_QUIET" &&
46 GIT_PAGER='' git log --format=%s -1 "$cmt"
48 # onto the next patch:
49 msgnum=$(($msgnum + 1))
50 echo "$msgnum" >"$state_dir/msgnum"
53 call_merge () {
54 cmt="$(cat "$state_dir/cmt.$1")"
55 echo "$cmt" > "$state_dir/current"
56 hd=$(git rev-parse --verify HEAD)
57 cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
58 msgnum=$(cat "$state_dir/msgnum")
59 eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
60 eval GITHEAD_$hd='$onto_name'
61 export GITHEAD_$cmt GITHEAD_$hd
62 if test -n "$GIT_QUIET"
63 then
64 GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY
66 test -z "$strategy" && strategy=recursive
67 eval 'git-merge-$strategy' $strategy_opts '"$cmt^" -- "$hd" "$cmt"'
68 rv=$?
69 case "$rv" in
71 unset GITHEAD_$cmt GITHEAD_$hd
72 return
75 git rerere $allow_rerere_autoupdate
76 die "$resolvemsg"
79 echo "Strategy: $strategy failed, try another" 1>&2
80 die "$resolvemsg"
83 die "Unknown exit code ($rv) from command:" \
84 "git-merge-$strategy $cmt^ -- HEAD $cmt"
86 esac
89 finish_rb_merge () {
90 move_to_original_branch
91 if test -s "$state_dir"/rewritten
92 then
93 git notes copy --for-rewrite=rebase <"$state_dir"/rewritten
94 if test -x "$GIT_DIR"/hooks/post-rewrite
95 then
96 "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
99 say All done.
102 case "$action" in
103 continue)
104 read_state
105 continue_merge
106 while test "$msgnum" -le "$end"
108 call_merge "$msgnum"
109 continue_merge
110 done
111 finish_rb_merge
112 return
114 skip)
115 read_state
116 git rerere clear
117 msgnum=$(($msgnum + 1))
118 while test "$msgnum" -le "$end"
120 call_merge "$msgnum"
121 continue_merge
122 done
123 finish_rb_merge
124 return
126 esac
128 mkdir -p "$state_dir"
129 echo "$onto_name" > "$state_dir/onto_name"
130 write_basic_state
132 msgnum=0
133 for cmt in `git rev-list --reverse --no-merges "$revisions"`
135 msgnum=$(($msgnum + 1))
136 echo "$cmt" > "$state_dir/cmt.$msgnum"
137 done
139 echo 1 >"$state_dir/msgnum"
140 echo $msgnum >"$state_dir/end"
142 end=$msgnum
143 msgnum=1
145 while test "$msgnum" -le "$end"
147 call_merge "$msgnum"
148 continue_merge
149 done
151 finish_rb_merge