Merge branch 'fc/remote-helper-fixes'
[git] / git-rebase--merge.sh
1 # This shell script fragment is sourced by git-rebase to implement
2 # its merge-based non-interactive mode that copes well with renamed
3 # files.
4 #
5 # Copyright (c) 2010 Junio C Hamano.
6 #
7
8 prec=4
9
10 read_state () {
11         onto_name=$(cat "$state_dir"/onto_name) &&
12         end=$(cat "$state_dir"/end) &&
13         msgnum=$(cat "$state_dir"/msgnum)
14 }
15
16 continue_merge () {
17         test -d "$state_dir" || die "$state_dir directory does not exist"
18
19         unmerged=$(git ls-files -u)
20         if test -n "$unmerged"
21         then
22                 echo "You still have unmerged paths in your index"
23                 echo "did you forget to use git add?"
24                 die "$resolvemsg"
25         fi
26
27         cmt=`cat "$state_dir/current"`
28         if ! git diff-index --quiet --ignore-submodules HEAD --
29         then
30                 if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt"
31                 then
32                         echo "Commit failed, please do not call \"git commit\""
33                         echo "directly, but instead do one of the following: "
34                         die "$resolvemsg"
35                 fi
36                 if test -z "$GIT_QUIET"
37                 then
38                         printf "Committed: %0${prec}d " $msgnum
39                 fi
40                 echo "$cmt $(git rev-parse HEAD^0)" >> "$state_dir/rewritten"
41         else
42                 if test -z "$GIT_QUIET"
43                 then
44                         printf "Already applied: %0${prec}d " $msgnum
45                 fi
46         fi
47         test -z "$GIT_QUIET" &&
48         GIT_PAGER='' git log --format=%s -1 "$cmt"
49
50         # onto the next patch:
51         msgnum=$(($msgnum + 1))
52         echo "$msgnum" >"$state_dir/msgnum"
53 }
54
55 call_merge () {
56         cmt="$(cat "$state_dir/cmt.$1")"
57         echo "$cmt" > "$state_dir/current"
58         hd=$(git rev-parse --verify HEAD)
59         cmt_name=$(git symbolic-ref HEAD 2> /dev/null || echo HEAD)
60         msgnum=$(cat "$state_dir/msgnum")
61         eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
62         eval GITHEAD_$hd='$onto_name'
63         export GITHEAD_$cmt GITHEAD_$hd
64         if test -n "$GIT_QUIET"
65         then
66                 GIT_MERGE_VERBOSITY=1 && export GIT_MERGE_VERBOSITY
67         fi
68         test -z "$strategy" && strategy=recursive
69         eval 'git-merge-$strategy' $strategy_opts '"$cmt^" -- "$hd" "$cmt"'
70         rv=$?
71         case "$rv" in
72         0)
73                 unset GITHEAD_$cmt GITHEAD_$hd
74                 return
75                 ;;
76         1)
77                 git rerere $allow_rerere_autoupdate
78                 die "$resolvemsg"
79                 ;;
80         2)
81                 echo "Strategy: $strategy failed, try another" 1>&2
82                 die "$resolvemsg"
83                 ;;
84         *)
85                 die "Unknown exit code ($rv) from command:" \
86                         "git-merge-$strategy $cmt^ -- HEAD $cmt"
87                 ;;
88         esac
89 }
90
91 finish_rb_merge () {
92         move_to_original_branch
93         if test -s "$state_dir"/rewritten
94         then
95                 git notes copy --for-rewrite=rebase <"$state_dir"/rewritten
96                 if test -x "$GIT_DIR"/hooks/post-rewrite
97                 then
98                         "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
99                 fi
100         fi
101         say All done.
102 }
103
104 case "$action" in
105 continue)
106         read_state
107         continue_merge
108         while test "$msgnum" -le "$end"
109         do
110                 call_merge "$msgnum"
111                 continue_merge
112         done
113         finish_rb_merge
114         return
115         ;;
116 skip)
117         read_state
118         git rerere clear
119         msgnum=$(($msgnum + 1))
120         while test "$msgnum" -le "$end"
121         do
122                 call_merge "$msgnum"
123                 continue_merge
124         done
125         finish_rb_merge
126         return
127         ;;
128 esac
129
130 mkdir -p "$state_dir"
131 echo "$onto_name" > "$state_dir/onto_name"
132 write_basic_state
133
134 msgnum=0
135 for cmt in `git rev-list --reverse --no-merges "$revisions"`
136 do
137         msgnum=$(($msgnum + 1))
138         echo "$cmt" > "$state_dir/cmt.$msgnum"
139 done
140
141 echo 1 >"$state_dir/msgnum"
142 echo $msgnum >"$state_dir/end"
143
144 end=$msgnum
145 msgnum=1
146
147 while test "$msgnum" -le "$end"
148 do
149         call_merge "$msgnum"
150         continue_merge
151 done
152
153 finish_rb_merge