On Mon, Sep 08, 2008 at 05:33:22PM -0700, Junio C Hamano wrote:
> I may not be reading your patch correctly; I am confused by what you are
> trying to do.
>
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index 5b2b1e5..84721c9 100755
> > --- a/git-rebase--interactive.sh
> > +++ b/git-rebase--interactive.sh
> > @@ -284,7 +284,7 @@ do_next () {
> > pick_one $sha1 ||
> > die_with_patch $sha1 "Could not apply $sha1... $rest"
> > make_patch $sha1
> > - : > "$DOTEST"/amend
> > + echo $sha1 > "$DOTEST"/amend
>
> You record the $sha1 from the TODO file.
Oops... I should have gone to bed instead of sending this patch...
>
> Perhaps you wanted to record the value of the HEAD in the first hunk?
You are asbolutely right. It should be:
git rev-parse --verify HEAD > "$DOTEST"/amend
>
> How would this change interact with the workflow of splitting existing
> commits, described at the end of git-rebase documentation?
It is not affected, because accordingly to the documentation, you
commit all your changes "until your working tree is clean."
However, if you forgot to commit your changes, without my patch
you may lose some of your splitting work. Here is the script that
demonstrates the problem
-- >8 --
#!/bin/sh
set -e
rm -rf git-test
mkdir -p git-test
cd git-test
git init
for ((i=0;$i<10;i++)) do echo $i; done > foo
git add foo
git commit -m 'add foo'
sed -e 's/^0$/first line/;s/^9/last line/' < foo > tmp
mv tmp foo
git add foo
git commit -m 'change foo'
echo bar > bar
git add bar
git commit -m 'more changes'
git log
echo '==='
GIT_EDITOR='sed -e '\''s/pick \(.* change foo\)/edit \1/'\'' < "$1" > tmp && mv tmp' git rebase -i HEAD~2
git reset HEAD^
{ echo y; echo n; } | git add -p
git commit -m 'commit chunk 1'
git add foo
# If I commit chunk 2 then everything will be fine with and without
# my patch
#
# git commit -m 'commit chunk 2'
#
# However, if I forgot to commit chunk 2 then without my patch rebase
# will lose my work on splitting these chunks!
#
# With my patch, it will error out: You have uncommitted changes
GIT_EDITOR=cat git rebase --continue
git log
-- >8 --
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
