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

Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index

Browse Source 
* ew/empty-merge-with-dirty-index-maint:
  merge-recursive: avoid incorporating uncommitted changes in a merge
  move index_has_changes() from builtin/am.c to merge.c for reuse
  t6044: recursive can silently incorporate dirty changes in a merge
This commit is contained in:
Junio C Hamano
2017-12-22 12:48:38 -08:00
parent 936d1b9894 65170c07d4
commit b6825b5c8e
5 changed files with 70 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
merge-recursive.c
View File

@ -1952,6 +1952,13 @@ int merge_trees(struct merge_options *o,
}
if (oid_eq(&common->object.oid, &merge->object.oid)) {
struct strbuf sb = STRBUF_INIT;
if (index_has_changes(&sb)) {
err(o, _("Dirty index: cannot merge (dirty: %s)"),
sb.buf);
return 0;
}
output(o, 0, _("Already up to date!"));
*result = head;
return 1;