summaryrefslogtreecommitdiff
path: root/builtin/rm.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-25 20:59:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-25 20:59:24 (GMT)
commit5e9d9787d278331385dbfcf962b32dc4e8d3eb5e (patch)
tree627b8d02082e85236c166a4806fda794626f96cc /builtin/rm.c
parentf3d508f40e3d85fdbe1dafe8f33782766c88dbdd (diff)
parentb2b1f615ce3b9383a32dec7f84488284004224f3 (diff)
downloadgit-5e9d9787d278331385dbfcf962b32dc4e8d3eb5e.zip
git-5e9d9787d278331385dbfcf962b32dc4e8d3eb5e.tar.gz
git-5e9d9787d278331385dbfcf962b32dc4e8d3eb5e.tar.bz2
Merge branch 'jc/denoise-rm-to-resolve'
"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
Diffstat (limited to 'builtin/rm.c')
-rw-r--r--builtin/rm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c
index 2eacda4..19ce95a 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -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);