development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 05:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/rebase' into HEAD

Browse source 
* js/rebase:
  Fixing path quoting in git-rebase
This commit is contained in:
Junio C Hamano 2007-10-30 21:37:51 -07:00
parent fee9832a8d 889a50e909
commit 5153399c9b
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
git-rebase.sh
View file

@ -59,7 +59,7 @@ continue_merge () {
die "$RESOLVEMSG" die "$RESOLVEMSG"
fi fi
cmt=`cat $dotest/current` cmt=`cat "$dotest/current"`
if ! git diff-index --quiet HEAD if ! git diff-index --quiet HEAD
then then
if ! git-commit -C "$cmt" if ! git-commit -C "$cmt"
@ -84,14 +84,14 @@ continue_merge () {
} }
call_merge () { call_merge () {
cmt="$(cat $dotest/cmt.$1)" cmt="$(cat "$dotest/cmt.$1")"
echo "$cmt" > "$dotest/current" echo "$cmt" > "$dotest/current"
hd=$(git rev-parse --verify HEAD) hd=$(git rev-parse --verify HEAD)
cmt_name=$(git symbolic-ref HEAD) cmt_name=$(git symbolic-ref HEAD)
msgnum=$(cat $dotest/msgnum) msgnum=$(cat "$dotest/msgnum")
end=$(cat $dotest/end) end=$(cat "$dotest/end")
eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"' eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
eval GITHEAD_$hd='"$(cat $dotest/onto_name)"' eval GITHEAD_$hd='$(cat "$dotest/onto_name")'
export GITHEAD_$cmt GITHEAD_$hd export GITHEAD_$cmt GITHEAD_$hd
git-merge-$strategy "$cmt^" -- "$hd" "$cmt" git-merge-$strategy "$cmt^" -- "$hd" "$cmt"
rv=$? rv=$?
@ -140,10 +140,10 @@ do
} }
if test -d "$dotest" if test -d "$dotest"
then then
prev_head="`cat $dotest/prev_head`" prev_head=$(cat "$dotest/prev_head")
end="`cat $dotest/end`" end=$(cat "$dotest/end")
msgnum="`cat $dotest/msgnum`" msgnum=$(cat "$dotest/msgnum")
onto="`cat $dotest/onto`" onto=$(cat "$dotest/onto")
continue_merge continue_merge
while test "$msgnum" -le "$end" while test "$msgnum" -le "$end"
do do
@ -160,11 +160,11 @@ do
if test -d "$dotest" if test -d "$dotest"
then then
git rerere clear git rerere clear
prev_head="`cat $dotest/prev_head`" prev_head=$(cat "$dotest/prev_head")
end="`cat $dotest/end`" end=$(cat "$dotest/end")
msgnum="`cat $dotest/msgnum`" msgnum=$(cat "$dotest/msgnum")
msgnum=$(($msgnum + 1)) msgnum=$(($msgnum + 1))
onto="`cat $dotest/onto`" onto=$(cat "$dotest/onto")
while test "$msgnum" -le "$end" while test "$msgnum" -le "$end"
do do
call_merge "$msgnum" call_merge "$msgnum"