summaryrefslogtreecommitdiff
path: root/branch.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-07-12 14:56:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-13 08:03:10 (GMT)
commit0af0ac7ebbbd2afbc4399d5658e193460b4caaa3 (patch)
tree1d268eea677a25ac3eb8a7192f4871653ebfcbc7 /branch.c
parent99d698f1e703754422f1dd780487ddbff3726dc3 (diff)
downloadgit-0af0ac7ebbbd2afbc4399d5658e193460b4caaa3.zip
git-0af0ac7ebbbd2afbc4399d5658e193460b4caaa3.tar.gz
git-0af0ac7ebbbd2afbc4399d5658e193460b4caaa3.tar.bz2
Move MERGE_RR from .git/rr-cache/ into .git/
If you want to reuse the rerere cache in another repository, and set a symbolic link to it, you do not want to have the two repositories interfer with each other by accessing the _same_ MERGE_RR. For example, if you use contrib/git-new-workdir to set up a second working directory, and you have a conflict in one working directory, but commit in the other working directory first, the wrong "resolution" will be recorded. The easy solution is to move MERGE_RR out of the rr-cache/ directory, which also corresponds with the notion that rr-cache/ contains cached resolutions, not some intermediate temporary states. Noticed by Kalle Olavi Niemitalo. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'branch.c')
-rw-r--r--branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/branch.c b/branch.c
index 56e9492..b1e59f2 100644
--- a/branch.c
+++ b/branch.c
@@ -166,7 +166,7 @@ void create_branch(const char *head,
void remove_branch_state(void)
{
unlink(git_path("MERGE_HEAD"));
- unlink(git_path("rr-cache/MERGE_RR"));
+ unlink(git_path("MERGE_RR"));
unlink(git_path("MERGE_MSG"));
unlink(git_path("SQUASH_MSG"));
}