{"thread":{"id":"6501","subject":"[PATCH 4/3] merge-one-file: fix late-night typo","startedAt":"2007-01-24T11:26:28Z","lastAt":"2007-01-24T11:26:28Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"32508","messageId":"Pine.LNX.4.63.0701241225420.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6501","inReplyTo":null,"subject":"[PATCH 4/3] merge-one-file: fix late-night typo","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-01-24T11:26:28Z","receivedAt":"2007-01-24T11:26:28Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nWhile fixing up some debugging cruft, this slipped in.\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n---\n\n\tOne day I will learn not to send off things when too tired.\n\t*sigh*\n\n builtin-merge-one-file.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-merge-one-file.c b/builtin-merge-one-file.c\nindex 5f74c6b..75774ce 100644\n--- a/builtin-merge-one-file.c\n+++ b/builtin-merge-one-file.c\n@@ -25,7 +25,7 @@ int cmd_merge_one_file(int argc, const char **argv, const char *prefix)\n \tfor (i = 0; i < 3; i++) {\n \t\tchar *p;\n \t\thashes[i] = buffers[i];\n-\t\tif (!*argv[i + 1] || *argv[i + 1])\n+\t\tif (!argv[i + 1] || !*argv[i + 1])\n \t\t\thashes[i] = NULL;\n \t\telse if (get_sha1_hex(argv[i + 1], buffers[i]))\n \t\t\treturn error(\"invalid hash: %s\\n\", argv[i + 1]);\n-- \n1.5.0.rc2.gee75e-dirty\n"}]}