kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: tweak magic band-aid 

Running checks against working tree (e.g. lstat()) and causing
changes to working tree (e.g. unlink()) while building a virtual
ancestor merge does not make any sense. Avoid doing so.

This is not a real fix; it is another magic band-aid on top of
another band-aid we placed earlier.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2011-03-17 22:22:06 -07:00
parent b2c8c0a762
commit b9b3eef761
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
merge-recursive.c
View File

@ -370,6 +370,13 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
struct stage_data *last_e; struct stage_data *last_e;
int i; int i;


/*
* Do not do any of this crazyness during the recursive; we don't
* even write anything to the working tree!
*/
if (o->call_depth)
return;

for (i = 0; i < entries->nr; i++) { for (i = 0; i < entries->nr; i++) {
const char *path = entries->items[i].string; const char *path = entries->items[i].string;
int len = strlen(path); int len = strlen(path);
@ -1274,7 +1281,7 @@ static int merge_content(struct merge_options *o,


if (mfi.clean && !df_conflict_remains && if (mfi.clean && !df_conflict_remains &&
sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode && sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode &&
lstat(path, &st) == 0) { !o->call_depth && !lstat(path, &st)) {
output(o, 3, "Skipped %s (merged same as existing)", path); output(o, 3, "Skipped %s (merged same as existing)", path);
add_cacheinfo(mfi.mode, mfi.sha, path, add_cacheinfo(mfi.mode, mfi.sha, path,
0 /*stage*/, 1 /*refresh*/, 0 /*options*/); 0 /*stage*/, 1 /*refresh*/, 0 /*options*/);