Re: [PATCH v2 2/4] t7505: ensure cleanup after hook blocks merge

2014-01-10 Thread Junio C Hamano
Matthieu Moy writes: > Ryan Biesemeyer writes: > >> + test_when_finished "git merge --abort" && >> + ( >> +git checkout -B other HEAD@{1} && > > Weird indentation (space/tab mix). Also I do not quite see why the body has to be in a subshell. -- To unsubscribe from this list: send

Re: [PATCH v2 2/4] t7505: ensure cleanup after hook blocks merge

2014-01-09 Thread Matthieu Moy
Ryan Biesemeyer writes: > + test_when_finished "git merge --abort" && > + ( > + git checkout -B other HEAD@{1} && Weird indentation (space/tab mix). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

[PATCH v2 2/4] t7505: ensure cleanup after hook blocks merge

2014-01-08 Thread Ryan Biesemeyer
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-commit