rebase --continue behaves differently between 1.7.0.2-preview20100309 and 1.7.3.1-preview20101002

[Lay, Stefan]

I have started a rebase operation with 1.7.0.2-preview20100309 and this led to an expected conflict. I resolved the conflict in the file and used EGit to add the new file content.

In the msysgit shell git status tell me:

$ git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: src/com/sap/calc/Calculator.java
# new file: src/com/sap/calc/Multiply.java
#

However, rebase --continue does not work:

$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add

With msysgit 1.7.3.1-preview20101002 git rebase --continue works in this scenario.

Maybe we are doing something wrong during egit add. We would like to know what has been changed in this scenario between 1.7.0.2-preview20100309 and 1.7.3.1-preview20101002.

We can also attach the zipped repository in the state after add in EGit.

[Tay Ray Chuan]

Just to be sure, you did a 'git add' on the resolved files? Your 'git
status' tells me so, but i just want to check.

Here's a simple test case to check for this. (If you've the git source
code, you could also try running t3418-rebase-continue.sh and
reporting your results.)

git init rebase-cont &&
cd rebase-cont && (
touch foo &&
echo "a line" > foo &&
git add foo &&
git commit -m "initial"
) &&
git checkout -b branch2 && (
echo "change2" >> foo &&
git commit -am "change2"
) &&
git checkout master && (
echo "change1" >> foo &&
git commit -am "change1"
) &&
! git rebase --onto master master branch2 &&
echo resolved > foo &&
git add foo &&
git rebase --continue &&
echo "success" ||
echo "FAIL"

This works on cygwin, PortableGit-1.7.3.1-preview20101002. What do you
get with it?

--
Cheers,
Ray Chuan

[Christian Halstrick]

Hi,

Your script works fine with both mentioned versions of MSysGit. I
think there is a misunderstanding here. This is about a problem you
see only when you use two tools together: trigger a rebase from
MSysGit and do the add of conflict resolutions with EGit (http://
www.eclipse.org/egit/). Stefan and I are comitters in EGit and we see
that MSysGit 1.7.0.2-preview20100309 and 1.7.3.1-preview20101002
behave differently when working on a repository which was previously
touched by EGit. To find out whether we have a problem in EGit add I
would like to know what was changed in MSysgit to make the previously
described test work.

Ciao
Chris