dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-03 06:31:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/denoise-rm-to-resolve'

Browse Source 
"git rm" to resolve a conflicted path leaked an internal message
"needs merge" before actually removing the path, which was
confusing.  This has been corrected.

* jc/denoise-rm-to-resolve:
  rm: resolving by removal is not a warning-worthy event
This commit is contained in:
Junio C Hamano
2019-07-25 13:59:24 -07:00
parent f3d508f40e b2b1f615ce
commit 5e9d9787d2
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rm.c
View File

@@ -273,7 +273,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
parse_pathspec(&pathspec, 0,
PATHSPEC_PREFER_CWD,
prefix, argv);
refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL);
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &pathspec, NULL, NULL);
seen = xcalloc(pathspec.nr, 1);