undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin-fmt-merge-msg: fix bugs in --file option

Browse Source 
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:
Michael Coleman 2007-02-27 23:44:42 -06:00 committed by Junio C Hamano
parent a91d49cd36
commit 163d7b9b85
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-fmt-merge-msg.c
View File

@ -259,13 +259,15 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
else if (!strcmp(argv[1], "--no-summary")) else if (!strcmp(argv[1], "--no-summary"))
merge_summary = 0; merge_summary = 0;
else if (!strcmp(argv[1], "-F") || !strcmp(argv[1], "--file")) { else if (!strcmp(argv[1], "-F") || !strcmp(argv[1], "--file")) {
if (argc < 2) if (argc < 3)
die ("Which file?"); die ("Which file?");
if (!strcmp(argv[2], "-")) if (!strcmp(argv[2], "-"))
in = stdin; in = stdin;
else { else {
fclose(in); fclose(in);
in = fopen(argv[2], "r"); in = fopen(argv[2], "r");
if (!in)
die("cannot open %s", argv[2]);
} }
argc--; argv++; argc--; argv++;
} else } else