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
--
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