diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-07-12 15:56:19 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-13 01:03:10 -0700 |
| commit | 0af0ac7ebbbd2afbc4399d5658e193460b4caaa3 (patch) | |
| tree | 1d268eea677a25ac3eb8a7192f4871653ebfcbc7 /builtin-rerere.c | |
| parent | builtin-rerere: more carefully find conflict markers (diff) | |
| download | tgif-0af0ac7ebbbd2afbc4399d5658e193460b4caaa3.tar.xz | |
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 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c index 69c3a52d5e..1db2e0c8fb 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -429,7 +429,7 @@ static int setup_rerere(struct path_list *merge_rr) if (!is_rerere_enabled()) return -1; - merge_rr_path = xstrdup(git_path("rr-cache/MERGE_RR")); + merge_rr_path = xstrdup(git_path("MERGE_RR")); fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1); read_rr(merge_rr); return fd; |