{"thread":{"id":"2377","subject":"git-status: do not mark unmerged paths as committable.","startedAt":"2005-11-07T01:39:06Z","lastAt":"2005-11-07T01:39:06Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"11235","messageId":"7vslu9uthh.fsf@assigned-by-dhcp.cox.net","threadId":"2377","inReplyTo":null,"subject":"git-status: do not mark unmerged paths as committable.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-07T01:39:06Z","receivedAt":"2005-11-07T01:39:06Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"An unmerged path appears as both \"Updated but not checked in\" list,\nand \"Changed but not updated\" list.  We are not going to commit that\npath until it is resolved, so remove it from the former list.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n\n---\n\n git-status.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\napplies-to: 49ac95e5ebfd28b32ec1a23a0982900426f0c06c\nf1790448628262e46496861bb6da76be63a2a247\ndiff --git a/git-status.sh b/git-status.sh\nindex 62a24a9..837f334 100755\n--- a/git-status.sh\n+++ b/git-status.sh\n@@ -41,7 +41,7 @@ git-update-index -q --unmerged --refresh\n \n if GIT_DIR=\"$GIT_DIR\" git-rev-parse --verify HEAD >/dev/null 2>&1\n then\n-\tgit-diff-index -M --cached --name-status HEAD |\n+\tgit-diff-index -M --cached --name-status --diff-filter=MDTCRA HEAD |\n \tsed -e '\n \t\ts/\\\\/\\\\\\\\/g\n \t\ts/ /\\\\ /g\n---\n0.99.9.GIT\n"}]}