[PATCH 11/21] list-files: -u does not imply showing stages
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Feb 8, 2015, 09:01 UTC
- Message-ID
- <1423386099-19994-12-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1423386099-19994-1-git-send-email-pclouds@gmail.com>
Showing full index entry information is something for ls-files only. The users of "git list-files" may just want to know what entries are not unmerged.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/ls-files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c index d55b5e7..c5468c7 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -656,7 +656,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) } if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed) require_work_tree = 1; - if (show_unmerged) + if (show_unmerged && !porcelain) /* * There's no point in showing unmerged unless * you also show the stage information.
-- 2.3.0.rc1.137.g477eb31