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];
29 my ($in_section, $in_desc);
37 last if (/^[-*\[]/ && $in_section);
38 next unless $in_section;
43 next unless ($in_section && $in_desc);
47 if ($in_section && @msg) {
48 open(my $fh, "-|", qw(git cat-file commit HEAD));
49 my @original = (<$fh>);
54 $in_section = 1 if (/^$/);
58 if (/^$/ && $in_section == 1) {
65 open($fh, "|-", qw(git commit --amend -F -));
69 ' <Meta
/whats-cooking.txt
"$1"
75 if ! git write-tree
2>/dev
/null
>/dev
/null
80 EDITOR
=: git commit
--no-verify
81 echo "Accepted previous resolution"
89 case "$branch" in '###') cut_seen
=$
(( $cut_seen + 1 )) ;; esac
90 if test -n "$stop_at_cut" && test $stop_at_cut -le $cut_seen
95 case "$branch" in '#'* |
'') continue ;; esac
101 save
=$
(git rev-parse
--verify HEAD
)
102 tip
=$
(git rev-parse
--verify "$branch^0")
103 mb
=$
(git merge-base
"$tip" "$save")
104 test "$mb" = "$tip" && continue
106 EDITOR
=: git merge
$accept_rerere --edit "$branch" ||
110 annotate_merge
"$branch" ||
exit
112 git commit
--amend ||
exit
114 this
=$
(git rev-parse
--verify HEAD
)
115 if test "$this" = "$save"
118 elif git show-ref
-q --verify "refs/merge-fix/$branch"
120 echo >&2 "Fixing up the merge"
121 git cherry-pick
--no-commit "refs/merge-fix/$branch" &&
122 EDITOR
=: git commit
--amend -a ||
exit
127 git cherry-pick
"$branch" ||
exit ;;
128 *) echo >&2 "Eh? $branch $eh"; exit ;;
134 if test -n "$update" && test $# = 0
136 set x $
(sed -n -e '2s/^# //p' <"$update") &&
140 # Generation (or updating)
142 x40
='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
143 x40
="$x40$x40$x40$x40$x40$x40$x40$x40"
149 "Merge branch '"*"'"*)
150 branch
=$
(expr "$msg" : "Merge branch '\(.*\)'")
153 "Merge remote branch '"*"'"*)
154 branch
=$
(expr "$msg" : "Merge remote branch '\(.*\)'")
158 echo 2>&1 "Huh?: $msg"
162 tip
=$
(git rev-parse
--verify "refs/$merge_hier$branch" 2>/dev
/null
) &&
163 merged
=$
(git name-rev
--refs="refs/$merge_hier$branch" "$other" 2>/dev
/null
) &&
164 merged
=$
(expr "$merged" : "$x40 \(.*\)") &&
165 test "$merged" != undefined ||
{
166 other
=$
(git log
-1 --pretty='format:%s' $other) &&
167 merged
="$branch :rebased? $other"
172 merged
="$(git rev-parse --verify "$commit") pick $msg"
180 echo 'case "$#,$1" in'
182 echo " exec $PROGRAM" '"$1" "$0"'
184 echo "$PROGRAM" '"$@" <<\EOF'
185 git log
--pretty=oneline
--first-parent "$1" |
188 while read commit msg
190 if other
=$
(git rev-parse
-q --verify "$commit^2")
201 series
="$merged$LF$series"
214 generate
"$0" "$@" |
diff -u "$update" -
217 echo >&2 "No changes."
219 echo >&2 -n "Update [y/N]? "
224 sed -e 's/ :rebased?.*//' >"$update" ;;
226 echo >&2 "No update then." ;;
230 generate
"$0" "$@" |
diff -u "$update" -