From: Phil Hord <phil.hord@gmail.com>
Date: Mon, 18 Jun 2012 22:41:05 GMT
Subject: Re: MERGE_RR droppings
Message-ID: <CABURp0os2no40BW0P-biG_fXyi7MHRcLLYWmCbLTdBv1o1OXcg@mail.gmail.com>
In-Reply-To: <CABURp0omkVoLrz29GeOjjoZOpN238Rm6Nu5aOKQyVxFVnPihsw@mail.gmail.com>

git mergetool decides to use rerere-remaining based on the existence
of the .git/MERGE_RR file:

    if test -e "$GIT_DIR/MERGE_RR"
    then
        files=$(git rerere remaining)
    else
        files=$(git ls-files -u | sed -e 's/^[^ ]*      //' | sort -u)
    fi

But when I disabled rerere, I still had MERGE_RR files left over in my
.git directory.   This causes git-mergetool to do the wrong thing.

I do not know if the correct fix for this is to check rerere.enabled instead.

Is MERGE_RR leaking somewhere it should have been cleaned up?  I often
see leftover MERGE_RR files even though I am certain the project is
not in the middle of a merge.

Is this a bad semaphore to check?  I do not see it being used this way
anywhere else.


Phil