Description Mikael Karlsson 2012-05-16 08:51:35 EDT

Build Identifier: JGit commit 37307af from https://github.com/eclipse/jgit/

When doing a pull using rebase when having a local commit (not pushed upstream), the local commit disappears.

Consider the attached JUnit test case. It should be run inside the JGit project to make sure the RepositoryTestCase class is available.

The test fails because the latest commit ("HEAD") is not the commit that was created locally before the pull. Instead, the locally created commit disappears completely from the log.

Running "git log" (using native git) inside the repos that the test creates confirms that the commit is actually gone.

Note: Pulling with rebase requires "rebase = true" for your branch in the config file, e.g. "git config branch.master.rebase true". The 

This is how you do this manually with native git:
    cd /tmp
    mkdir jgit
    cd jgit
    git init source
    git init target
    cd source
    echo "Hello world" > SomeFile.txt
    git add SomeFile.txt
    git commit -m "Initial commit for source"

    cd ../target
    git config branch.master.remote origin
    git config branch.master.merge "refs/heads/master"
    git remote add origin /tmp/jgit/source
    git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
    git pull origin master
    git config branch.master.rebase true

    cd ../source
    echo "Source change" > SomeFile.txt
    git add SomeFile.txt
    git commit -m "Source commit message for rebase flag test"

    cd ../target
    echo "New file from target" > newFile.txt
    git add newFile.txt
    git commit -m "Target commit message for rebase flag test"
    git log
    git pull origin master (should do rebase by default)
    git log
    
Now compare output to log before pull.

The first git log command will give us:
Target commit message for rebase flag test
Initial commit for source

After the pull (with rebase), git log gives us:
Target commit message for rebase flag test
Source commit message for rebase flag test
Initial commit for source

In the JGit test, the log looks like this:
Source commit message for rebase flag test
Initial commit for source

As you can see, the "Target commit message for rebase flag test" commit mysteriously disappeared.

I'll be happy to assist you with more information. Just let me know.

Reproducible: Always

Steps to Reproduce:
1. Run the attached test
2. Check the output
3. Compare output with doing the same thing manually with git (instructions included)