* [PATCH] builtin-fmt-merge-msg: fix bugs in --file option
@ 2007-02-28 5:44 Michael Coleman
0 siblings, 0 replies; only message in thread
From: Michael Coleman @ 2007-02-28 5:44 UTC (permalink / raw)
To: git; +Cc: Michael Coleman
If --file's argument is missing, don't crash. If it cannot be opened,
die with an error message.
---
builtin-fmt-merge-msg.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 1489883..5c145d2 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -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
--
1.5.0.rc3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-02-28 5:45 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-28 5:44 [PATCH] builtin-fmt-merge-msg: fix bugs in --file option Michael Coleman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).