[PATCH] merge: make merge state available to prepare-commit-msg hook

From a1f898fdf560e719d447a544569d5d1457307855 Mon Sep 17 00:00:00 2001
From: Ryan Biesemeyer <ryan@yaauie.com>
Date: Wed, 8 Jan 2014 04:22:12 +0000
Subject: [PATCH 0/2] merge make merge state available to prepare-commit-msg hook

Since prepare-commit-msg hook is given 'merge' as an argument when a merge is taking place, it was surprising that the merge state (MERGE_HEAD, etc.) was not present for the hook's execution.

Make sure that the merge state is written before the prepare-commit-msg hook is called.

Ryan Biesemeyer (2):
  merge: make prepare_to_commit responsible for write_merge_state
  merge: drop unused arg from abort_commit method signature

 builtin/merge.c                    | 13 +++++++------
 t/t7505-prepare-commit-msg-hook.sh | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)