X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-fmt-merge-msg.c;h=87d3d63ec71ec7f08127085330d28ed28e3f35c7;hb=e0d10e1c63bc52b37bbec99b07deee794058d9b4;hp=3d3097d299d4c964e1acfff7a365501a8bd53587;hpb=c56f243e20ce48ae50caf841ada8435a21c2a8bf;p=git.git

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 3d3097d29..87d3d63ec 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -278,6 +278,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 
 	/* get current branch */
 	current_branch = resolve_ref("HEAD", head_sha1, 1, NULL);
+	if (!current_branch)
+		die("No current branch");
 	if (!strncmp(current_branch, "refs/heads/", 11))
 		current_branch += 11;