mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
builtin-fmt-merge-msg: fix bugs in --file option
If --file's argument is missing, don't crash. If it cannot be opened, die with an error message. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
a91d49cd36
commit
163d7b9b85
|
@ -259,13 +259,15 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
|
|||
else if (!strcmp(argv[1], "--no-summary"))
|
||||
merge_summary = 0;
|
||||
else if (!strcmp(argv[1], "-F") || !strcmp(argv[1], "--file")) {
|
||||
if (argc < 2)
|
||||
if (argc < 3)
|
||||
die ("Which file?");
|
||||
if (!strcmp(argv[2], "-"))
|
||||
in = stdin;
|
||||
else {
|
||||
fclose(in);
|
||||
in = fopen(argv[2], "r");
|
||||
if (!in)
|
||||
die("cannot open %s", argv[2]);
|
||||
}
|
||||
argc--; argv++;
|
||||
} else
|
||||
|
|
Loading…
Reference in a new issue