From a1f898fdf560e719d447a544569d5d1457307855 Mon Sep 17 00:00:00 2001
From: Ryan Biesemeyer
Date: Wed, 8 Jan 2014 04:22:12 +
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
From 9b431e5206652cf62ebb09dad4607989976e7748 Mon Sep 17 00:00:00 2001
From: Ryan Biesemeyer
Date: Wed, 8 Jan 2014 00:46:41 +
Subject: [PATCH 1/2] merge: make prepare_to_commit responsible for
write_merge_state
When merging, make the prepare-commit-msg hook have access to the merge
state in
From a1f898fdf560e719d447a544569d5d1457307855 Mon Sep 17 00:00:00 2001
From: Ryan Biesemeyer
Date: Wed, 8 Jan 2014 00:47:41 +
Subject: [PATCH 2/2] merge: drop unused arg from abort_commit method signature
Since abort_commit is no longer responsible for writing merge state, remove
the unused
On 2014-01-08, at 20:06Z, Matthieu Moy wrote:
> Ryan Biesemeyer writes:
>
>> index 3573751..89cdfe8 100755
>> --- a/t/t7505-prepare-commit-msg-hook.sh
>> +++ b/t/t7505-prepare-commit-msg-hook.sh
>> @@ -181,5 +181,27 @@ test_expect_success 'with failing hoo
Ensure merge state is available to the prepare-commit-msg hook.
v2 patchset incorporates early feedback from the list
Matthieu Moy (1):
t7505: add missing &&
Ryan Biesemeyer (3):
t7505: ensure cleanup after hook blocks merge
merge: make prepare_to_commit responsible for write_mer
change effectively ensures that the merge state is also available to the
prepare-commit-msg hook and while the message is being edited.
Signed-off-by: Ryan Biesemeyer
---
builtin/merge.c| 3 ++-
t/t7505-prepare-commit-msg-hook.sh | 21 +
2 files changed, 23
Signed-off-by: Ryan Biesemeyer
---
t/t7505-prepare-commit-msg-hook.sh | 25 +
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/t/t7505-prepare-commit-msg-hook.sh
b/t/t7505-prepare-commit-msg-hook.sh
index 1c95652..697ecc0 100755
--- a/t/t7505-prepare
From: Matthieu Moy
Signed-off-by: Ryan Biesemeyer
---
t/t7505-prepare-commit-msg-hook.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7505-prepare-commit-msg-hook.sh
b/t/t7505-prepare-commit-msg-hook.sh
index 3573751..1c95652 100755
--- a/t/t7505-prepare-commit-msg
Since abort_commit is no longer responsible for writing merge state, remove
the unused argument that was originally needed solely for writing merge state.
Signed-off-by: Ryan Biesemeyer
---
builtin/merge.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin
9 matches
Mail list logo