mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

rerere: handle leftover rr-cache/$ID directory and postimage files

Browse source 
If by some accident there is only $GIT_DIR/rr-cache/$ID directory
existed, we wouldn't have recorded a preimage for a conflict that
is newly encountered, which would mean after a manual resolution,
we wouldn't have recorded it by storing the postimage, because the
logic used to be "if there is no rr-cache/$ID directory, then we are
the first so record the preimage".  Instead, record preimage if we
do not have one.

In addition, if there is only $GIT_DIR/rr-cache/$ID/postimage
without corresponding preimage, we would have tried to call into
merge() and punted.

These would have been a situation frustratingly hard to recover
from.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-07-17 13:28:31 -07:00
parent 2c7929b133
commit 05dd9f139d
2 changed files with 41 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
rerere.c
View file

@ -117,7 +117,9 @@ static struct rerere_dir *find_rerere_dir(const char *hex)
static int has_rerere_resolution(const struct rerere_id *id) static int has_rerere_resolution(const struct rerere_id *id)
{ {
return (id->collection->status & RR_HAS_POSTIMAGE); const int both = RR_HAS_POSTIMAGE|RR_HAS_PREIMAGE;
return ((id->collection->status & both) == both);
} }
static struct rerere_id *new_rerere_id_hex(char *hex) static struct rerere_id *new_rerere_id_hex(char *hex)
@ -806,24 +808,30 @@ static int do_plain_rerere(struct string_list *rr, int fd)
string_list_insert(rr, path)->util = id; string_list_insert(rr, path)->util = id;
/* /*
* If the directory does not exist, create * Ensure that the directory exists.
* it. mkdir_in_gitdir() will fail with * mkdir_in_gitdir() will fail with EEXIST if there
* EEXIST if there already is one. * already is one.
*
* NEEDSWORK: make sure "gc" does not remove
* preimage without removing the directory.
*/ */
if (mkdir_in_gitdir(rerere_path(id, NULL))) if (mkdir_in_gitdir(rerere_path(id, NULL)) &&
continue; errno != EEXIST)
continue; /* NEEDSWORK: perhaps we should die? */
/* if (id->collection->status & RR_HAS_PREIMAGE) {
* We are the first to encounter this ;
* conflict. Ask handle_file() to write the } else {
* normalized contents to the "preimage" file. /*
*/ * We are the first to encounter this
handle_file(path, NULL, rerere_path(id, "preimage")); * conflict. Ask handle_file() to write the
id->collection->status |= RR_HAS_PREIMAGE; * normalized contents to the "preimage" file.
fprintf(stderr, "Recorded preimage for '%s'\n", path); *
* NEEDSWORK: what should happen if we had a
* leftover postimage that is totally
* unrelated? Perhaps we should unlink it?
*/
handle_file(path, NULL, rerere_path(id, "preimage"));
id->collection->status |= RR_HAS_PREIMAGE;
fprintf(stderr, "Recorded preimage for '%s'\n", path);
}
} }
for (i = 0; i < rr->nr; i++) for (i = 0; i < rr->nr; i++)

17
t/t4200-rerere.sh
View file

@ -184,12 +184,27 @@ test_expect_success 'rerere updates postimage timestamp' '
' '
test_expect_success 'rerere clear' ' test_expect_success 'rerere clear' '
rm $rr/postimage && mv $rr/postimage .git/post-saved &&
echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR && echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
git rerere clear && git rerere clear &&
! test -d $rr ! test -d $rr
' '
test_expect_success 'leftover directory' '
git reset --hard &&
mkdir -p $rr &&
test_must_fail git merge first &&
test -f $rr/preimage
'
test_expect_success 'missing preimage' '
git reset --hard &&
mkdir -p $rr &&
cp .git/post-saved $rr/postimage &&
test_must_fail git merge first &&
test -f $rr/preimage
'
test_expect_success 'set up for garbage collection tests' ' test_expect_success 'set up for garbage collection tests' '
mkdir -p $rr && mkdir -p $rr &&
echo Hello >$rr/preimage && echo Hello >$rr/preimage &&