mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint

Browse Source 
The merge-recursive machinery failed to refresh the cache entry for
a merge result in a couple of places, resulting in an unnecessary
merge failure, which has been fixed.

* en/t3433-rebase-stat-dirty-failure:
  merge-recursive: fix the refresh logic in update_file_flags
  t3433: new rebase testcase documenting a stat-dirty-like failure
This commit is contained in:
Junio C Hamano
2020-03-17 15:02:23 -07:00
parent 16a4bf1035 fb1c18fc46
commit 569b89842d
2 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
merge-recursive.c
View File

@ -998,10 +998,13 @@ static int update_file_flags(struct merge_options *opt,
free(buf);
}
update_index:
if (!ret && update_cache)
if (add_cacheinfo(opt, contents, path, 0, update_wd,
if (!ret && update_cache) {
int refresh = (!opt->priv->call_depth &&
contents->mode != S_IFGITLINK);
if (add_cacheinfo(opt, contents, path, 0, refresh,
ADD_CACHE_OK_TO_ADD))
return -1;
}
return ret;
}