mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ew/rebase' into next

Browse Source 
* ew/rebase:
  rebase --merge: fix for rebasing more than 7 commits.
This commit is contained in:
Junio C Hamano
2006-06-22 02:29:58 -07:00
parent 8ec7e19499 5887ac821f
commit b8ca3fbd46
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
git-rebase.sh
View File

@ -67,16 +67,16 @@ continue_merge () {
prev_head=`git-rev-parse HEAD^0` prev_head=`git-rev-parse HEAD^0`
# save the resulting commit so we can read-tree on it later # save the resulting commit so we can read-tree on it later
echo "$prev_head" > "$dotest/`printf %0${prec}d $msgnum`.result" echo "$prev_head" > "$dotest/cmt.$msgnum.result"
echo "$prev_head" > "$dotest/prev_head" echo "$prev_head" > "$dotest/prev_head"
# onto the next patch: # onto the next patch:
msgnum=$(($msgnum + 1)) msgnum=$(($msgnum + 1))
printf "%0${prec}d" "$msgnum" > "$dotest/msgnum" echo "$msgnum" >"$dotest/msgnum"
} }
call_merge () { call_merge () {
cmt="$(cat $dotest/`printf %0${prec}d $1`)" cmt="$(cat $dotest/cmt.$1)"
echo "$cmt" > "$dotest/current" echo "$cmt" > "$dotest/current"
git-merge-$strategy "$cmt^" -- HEAD "$cmt" git-merge-$strategy "$cmt^" -- HEAD "$cmt"
rv=$? rv=$?
@ -108,15 +108,12 @@ finish_rb_merge () {
end="`cat $dotest/end`" end="`cat $dotest/end`"
while test "$msgnum" -le "$end" while test "$msgnum" -le "$end"
do do
msgnum=`printf "%0${prec}d" "$msgnum"` git-read-tree `cat "$dotest/cmt.$msgnum.result"`
printf "%0${prec}d" "$msgnum" > "$dotest/msgnum"
git-read-tree `cat "$dotest/$msgnum.result"`
git-checkout-index -q -f -u -a git-checkout-index -q -f -u -a
git-commit -C "`cat $dotest/$msgnum`" git-commit -C "`cat $dotest/cmt.$msgnum`"
echo "Committed $msgnum" printf "Committed %0${prec}d" $msgnum
echo ' '`git-rev-list --pretty=oneline -1 HEAD | \ echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
sed 's/^[a-f0-9]\+ //'` sed 's/^[a-f0-9]\+ //'`
msgnum=$(($msgnum + 1)) msgnum=$(($msgnum + 1))
done done
@ -322,11 +319,11 @@ for cmt in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \
| perl -e 'print reverse <>'` | perl -e 'print reverse <>'`
do do
msgnum=$(($msgnum + 1)) msgnum=$(($msgnum + 1))
echo "$cmt" > "$dotest/`printf "%0${prec}d" $msgnum`" echo "$cmt" > "$dotest/cmt.$msgnum"
done done
printf "%0${prec}d" 1 > "$dotest/msgnum" echo 1 >"$dotest/msgnum"
printf "%0${prec}d" "$msgnum" > "$dotest/end" echo $msgnum >"$dotest/end"
end=$msgnum end=$msgnum
msgnum=1 msgnum=1