summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-27 22:15:42 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-27 22:15:42 -0800
commitc4f8f827555dcbbee148fd1daa4821533ead2ea2 (patch)
tree6fe27e7692192451906b072f71ce65909b8fd5e4 /builtin-fmt-merge-msg.c
parent8538e876b191901b7d37ec34a83287e51df91816 (diff)
parent163d7b9b8536d206eda7eb0eccb0fc211812346f (diff)
downloadgit-c4f8f827555dcbbee148fd1daa4821533ead2ea2.tar.gz
Merge branch 'maint'
* maint: builtin-fmt-merge-msg: fix bugs in --file option index-pack: Loop over pread until data loading is complete. blameview: Fix the browse behavior in blameview Fix minor typos/grammar in user-manual.txt Correct ordering in git-cvsimport's option documentation git-show: Reject native ref Fix git-show man page formatting in the EXAMPLES section
Diffstat (limited to 'builtin-fmt-merge-msg.c')
-rw-r--r--builtin-fmt-merge-msg.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 1489883564..5c145d2165 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