[PATCH v2 11/17] ls: -u does not imply showing stages
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Mar 26, 2014, 13:48 UTC
- Message-ID
- <1395841697-11742-12-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1395841697-11742-1-git-send-email-pclouds@gmail.com>
Showing full index entry information is something for ls-files only. The users of "git ls" may just want to know what entries are not unmerged.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.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 74eb3c2..1638983 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -527,7 +527,7 @@ static int ls_files(const char **argv, const char *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.
-- 1.9.1.345.ga1a145c