diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 23:59:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 23:59:24 +0300 |
| commit | 5e9d9787d278331385dbfcf962b32dc4e8d3eb5e (patch) | |
| tree | 627b8d02082e85236c166a4806fda794626f96cc /builtin/rm.c | |
| parent | f3d508f40e3d85fdbe1dafe8f33782766c88dbdd (diff) | |
| parent | b2b1f615ce3b9383a32dec7f84488284004224f3 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 2eacda42b4..19ce95a901 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); |