global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-21 16:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'en/merge-recursive' into next

Browse Source 
* en/merge-recursive:
  merge-recursive: tweak magic band-aid
This commit is contained in:
Junio C Hamano
2011-03-18 14:32:09 -07:00
parent 5ddab49db9 b9b3eef761
commit a32016be06
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
merge-recursive.c
View File

@@ -360,6 +360,13 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
struct stage_data *last_e;
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++) {
const char *path = entries->items[i].string;
int len = strlen(path);
@@ -1266,7 +1273,7 @@ static int merge_content(struct merge_options *o,
if (mfi.clean && !df_conflict_remains &&
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);
add_cacheinfo(mfi.mode, mfi.sha, path,
0 /*stage*/, 1 /*refresh*/, 0 /*options*/);