[PATCH 11/21] list-files: -u does not imply showing stages

From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Jan 25, 2015, 12:37 UTC
Message-ID: <1422189476-7518-12-git-send-email-pclouds@gmail.com>
In-Reply-To: <1422189476-7518-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 eca9407..f2c29ce 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.2.0.84.ge9c7a8a