3 accept_rerere
="--rerere-autoupdate" generate
=no update
= diff= edit
= stop_at_cut
=
4 while case "$#,$1" in 0,*) break;; *,-*) ;; esac
10 -c?
*) stop_at_cut
=${1#-c} ;;
11 -d) update
=${2?"diff with what?"}
15 -u) update
=${2?"update what?"}
25 test -f Meta
/whats-cooking.txt ||
return 0
28 my ($branch) = $ARGV[0];
39 next unless $in_section;
44 if ($in_section && @msg) {
45 open(my $fh, "-|", qw(git cat-file commit HEAD));
46 my @original = (<$fh>);
51 $in_section = 1 if (/^$/);
55 if (/^$/ && $in_section == 1) {
62 open($fh, "|-", qw(git commit --amend -F -));
66 ' <Meta
/whats-cooking.txt
"$1"
72 if ! git write-tree
2>/dev
/null
>/dev
/null
77 EDITOR
=: git commit
--no-verify
78 echo "Accepted previous resolution"
86 case "$branch" in '###') cut_seen
=$
(( $cut_seen + 1 )) ;; esac
87 if test -n "$stop_at_cut" && test $stop_at_cut -le $cut_seen
92 case "$branch" in '#'* |
'') continue ;; esac
98 save
=$
(git rev-parse
--verify HEAD
)
99 tip
=$
(git rev-parse
--verify "$branch^0")
100 mb
=$
(git merge-base
"$tip" "$save")
101 test "$mb" = "$tip" && continue
103 EDITOR
=: git merge
$accept_rerere "$branch" ||
107 annotate_merge
"$branch" ||
exit
109 git commit
--amend ||
exit
111 this
=$
(git rev-parse
--verify HEAD
)
112 if test "$this" = "$save"
115 elif git show-ref
-q --verify "refs/merge-fix/$branch"
117 echo >&2 "Fixing up the merge"
118 git cherry-pick
--no-commit "refs/merge-fix/$branch" &&
119 EDITOR
=: git commit
--amend -a ||
exit
124 git cherry-pick
"$branch" ||
exit ;;
125 *) echo >&2 "Eh? $branch $eh"; exit ;;
131 if test -n "$update" && test $# = 0
133 set x $
(sed -n -e '2s/^# //p' <"$update") &&
137 # Generation (or updating)
139 x40
='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
140 x40
="$x40$x40$x40$x40$x40$x40$x40$x40"
146 "Merge branch '"*"'"*)
147 branch
=$
(expr "$msg" : "Merge branch '\(.*\)'")
150 "Merge remote branch '"*"'"*)
151 branch
=$
(expr "$msg" : "Merge remote branch '\(.*\)'")
155 echo 2>&1 "Huh?: $msg"
159 tip
=$
(git rev-parse
--verify "refs/$merge_hier$branch" 2>/dev
/null
) &&
160 merged
=$
(git name-rev
--refs="refs/$merge_hier$branch" "$other" 2>/dev
/null
) &&
161 merged
=$
(expr "$merged" : "$x40 \(.*\)") &&
162 test "$merged" != undefined ||
{
163 other
=$
(git log
-1 --pretty='format:%s' $other) &&
164 merged
="$branch :rebased? $other"
169 merged
="$(git rev-parse --verify "$commit") pick $msg"
177 echo 'case "$#,$1" in'
179 echo " exec $PROGRAM" '"$1" "$0"'
181 echo "$PROGRAM" '"$@" <<\EOF'
182 git log
--pretty=oneline
--first-parent "$1" |
185 while read commit msg
187 if other
=$
(git rev-parse
-q --verify "$commit^2")
198 series
="$merged$LF$series"
211 generate
"$0" "$@" |
diff -u "$update" -
214 echo >&2 "No changes."
216 echo >&2 -n "Update [y/N]? "
221 sed -e 's/ :rebased?.*//' >"$update" ;;
223 echo >&2 "No update then." ;;
227 generate
"$0" "$@" |
diff -u "$update" -