{"thread":{"id":"7011","subject":"[PATCH] builtin-fmt-merge-msg: fix bugs in --file option","startedAt":"2007-02-28T05:44:42Z","lastAt":"2007-02-28T05:44:42Z","messageCount":1,"participants":["Michael Coleman"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"35777","messageId":"1172641482207-git-send-email-tutufan@gmail.com","threadId":"7011","inReplyTo":null,"subject":"[PATCH] builtin-fmt-merge-msg: fix bugs in --file option","fromName":"Michael Coleman","fromEmail":"tutufan@gmail.com","sentAt":"2007-02-28T05:44:42Z","receivedAt":"2007-02-28T05:44:42Z","isPatch":true,"sender":{"key":"tutufan@gmail.com","avatar":null},"body":"If --file's argument is missing, don't crash.  If it cannot be opened,\ndie with an error message.\n---\n builtin-fmt-merge-msg.c |    4 +++-\n 1 files changed, 3 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c\nindex 1489883..5c145d2 100644\n--- a/builtin-fmt-merge-msg.c\n+++ b/builtin-fmt-merge-msg.c\n@@ -259,13 +259,15 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n \t\telse if (!strcmp(argv[1], \"--no-summary\"))\n \t\t\tmerge_summary = 0;\n \t\telse if (!strcmp(argv[1], \"-F\") || !strcmp(argv[1], \"--file\")) {\n-\t\t\tif (argc < 2)\n+\t\t\tif (argc < 3)\n \t\t\t\tdie (\"Which file?\");\n \t\t\tif (!strcmp(argv[2], \"-\"))\n \t\t\t\tin = stdin;\n \t\t\telse {\n \t\t\t\tfclose(in);\n \t\t\t\tin = fopen(argv[2], \"r\");\n+\t\t\t\tif (!in)\n+\t\t\t\t\tdie(\"cannot open %s\", argv[2]);\n \t\t\t}\n \t\t\targc--; argv++;\n \t\t} else\n-- \n1.5.0.rc3\n"}]}