{"thread":{"id":"53739","subject":"[PATCH] builtin/diff: fix botched update of usage comment","startedAt":"2020-06-23T09:20:07Z","lastAt":"2020-06-23T09:20:07Z","messageCount":1,"participants":["Denton Liu"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"400350","messageId":"4a1e357c390690375374490cd5aa2431a2593b9d.1592903964.git.liu.denton@gmail.com","threadId":"53739","inReplyTo":null,"subject":"[PATCH] builtin/diff: fix botched update of usage comment","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2020-06-23T09:19:49Z","receivedAt":"2020-06-23T09:20:07Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"In the previous commit, an attempt was made to correct the \"N=1, M=0\"\ncase. However, the fix was botched and it introduced two half-correct\nsections by mistake. Combine these half-correct sections into one fully\ncorrect section.\n\nSigned-off-by: Denton Liu <liu.denton@gmail.com>\n---\n\nNotes:\n    This patch is based on dl/diff-usage-comment-update.\n\n builtin/diff.c | 5 +----\n 1 file changed, 1 insertion(+), 4 deletions(-)\n\ndiff --git a/builtin/diff.c b/builtin/diff.c\nindex bdae4d6a58..cdfb58d04b 100644\n--- a/builtin/diff.c\n+++ b/builtin/diff.c\n@@ -284,11 +284,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)\n \t * N=1, M=0:\n \t *      tree vs files (diff-index)\n \t *\n-\t * N=1, M=0:\n-\t *      tree vs cache (diff-index --cached)\n-\t *\n \t * N=1, M=0, --cached:\n-\t *      tree vs files (diff-index)\n+\t *      tree vs cache (diff-index --cached)\n \t *\n \t * N=2, M=0:\n \t *      tree vs tree (diff-tree)\n-- \n2.27.0.132.g321788e831\n\n"}]}