diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:17 (GMT) |
| commit | 9c65991abd7c954be8c3a1414f6cf365b83ee317 (patch) | |
| tree | c1b9516750692954a948cc7beafdea1088b00378 /builtin | |
| parent | 2f72ebfcd02b06a19e6c5429fcfc78b5fc754144 (diff) | |
| parent | b2b1f615ce3b9383a32dec7f84488284004224f3 (diff) | |
| download | git-9c65991abd7c954be8c3a1414f6cf365b83ee317.zip git-9c65991abd7c954be8c3a1414f6cf365b83ee317.tar.gz git-9c65991abd7c954be8c3a1414f6cf365b83ee317.tar.bz2 | |
Merge branch 'jc/denoise-rm-to-resolve' into maint
"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')
| -rw-r--r-- | builtin/rm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 90cbe89..bf4a443 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); |