mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 11:11:18 +02:00
Code

merge-recursive: handle D/F conflict case more carefully.

Browse Source 
When a path D that originally was blob in the ancestor was
modified on our branch while it was removed on the other branch,
we keep stages 1 and 2, and leave our version in the working
tree.  If the other branch created a path D/F, however, that
path can cleanly be resolved in the index (after all, the
ancestor nor we do not have it and only the other side added),
but it cannot be checked out.  The issue is the same when the
other branch had D and we had renamed it to D/F, or the ancestor
had D/F instead of D (so there are four combinations).

Do not stop the merge, but leave both D and D/F paths in the
index so that the user can clear things up.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-04-07 06:41:13 -07:00
parent ac7f0f436e
commit 4d50895a39
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
merge-recursive.c
View File

@ -596,9 +596,31 @@ static void update_file_flags(const unsigned char *sha,
if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
int fd;
if (mkdir_p(path, 0777))
die("failed to create path %s: %s", path, strerror(errno));
unlink(path);
int status;
const char *msg = "failed to create path '%s'%s";
status = mkdir_p(path, 0777);
if (status) {
if (status == -3) {
/* something else exists */
error(msg, path, ": perhaps a D/F conflict?");
update_wd = 0;
goto update_index;
}
die(msg, path, "");
}
if (unlink(path)) {
if (errno == EISDIR) {
/* something else exists */
error(msg, path, ": perhaps a D/F conflict?");
update_wd = 0;
goto update_index;
}
if (errno != ENOENT)
die("failed to unlink %s "
"in preparation to update: %s",
path, strerror(errno));
}
if (mode & 0100)
mode = 0777;
else
@ -620,6 +642,7 @@ static void update_file_flags(const unsigned char *sha,
die("do not know what to do with %06o %s '%s'",
mode, sha1_to_hex(sha), path);
}
update_index:
if (update_cache)
add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
}