{"thread":{"id":"51071","subject":"[PATCH 0/1] Fix git status' display of git rebase -ir's label commands","startedAt":"2019-05-10T20:23:17Z","lastAt":"2019-05-10T20:23:17Z","messageCount":2,"participants":["Johannes Schindelin via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"375314","messageId":"pull.188.git.gitgitgadget@gmail.com","threadId":"51071","inReplyTo":null,"subject":"[PATCH 0/1] Fix git status' display of git rebase -ir's label commands","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-05-10T20:23:13Z","receivedAt":"2019-05-10T20:23:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Those label commands are currently displayed with their argument resolved as\nabbreviated commit hash. Not really what we want. We really want the label\nnames instead.\n\nJohannes Schindelin (1):\n  status: fix display of rebase -ir's `label` command\n\n wt-status.c | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\n\nbase-commit: 8104ec994ea3849a968b4667d072fedd1e688642\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-188%2Fdscho%2Ffix-status-with-rebase-ir-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-188/dscho/fix-status-with-rebase-ir-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/188\n-- \ngitgitgadget\n"},{"id":"375315","messageId":"ec9eed5c88b062b7bdfdb5f82b3716f1341ce01c.1557519792.git.gitgitgadget@gmail.com","threadId":"51071","inReplyTo":"pull.188.git.gitgitgadget@gmail.com","subject":"[PATCH 1/1] status: fix display of rebase -ir's `label` command","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-05-10T20:23:14Z","receivedAt":"2019-05-10T20:23:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThe argument of a `label` command does *not* want to be turned into an\nabbreviated SHA-1.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n wt-status.c | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/wt-status.c b/wt-status.c\nindex 1f564b12d2..5fc7de6027 100644\n--- a/wt-status.c\n+++ b/wt-status.c\n@@ -1197,7 +1197,9 @@ static void abbrev_sha1_in_line(struct strbuf *line)\n \tint i;\n \n \tif (starts_with(line->buf, \"exec \") ||\n-\t    starts_with(line->buf, \"x \"))\n+\t    starts_with(line->buf, \"x \") ||\n+\t    starts_with(line->buf, \"label \") ||\n+\t    starts_with(line->buf, \"l \"))\n \t\treturn;\n \n \tsplit = strbuf_split_max(line, ' ', 3);\n-- \ngitgitgadget\n"}]}