Re: [PATCH v2 1/2] t7505: Add tests for cherry-pick and rebase -i/-p

2018-01-23 Thread Junio C Hamano
Phillip Wood writes: > + export GIT_SEQUENCE_EDITOR GIT_EDITOR && > + test_must_fail git rebase $mode b && > + echo x>a && "echo x >a"

Re: [PATCH v2 1/2] t7505: Add tests for cherry-pick and rebase -i/-p

2018-01-23 Thread Junio C Hamano
Phillip Wood writes: > @@ -31,17 +63,40 @@ mkdir -p "$HOOKDIR" > echo "#!$SHELL_PATH" > "$HOOK" > cat >> "$HOOK" <<'EOF' > > +GIT_DIR=$(git rev-parse --git-dir) > +if test -d "$GIT_DIR/rebase-merge" > +then > + rebasing=1 > +else > + rebasing=0 > +fi > + > +get_last_cmd () { > + tail -n1 "

[PATCH v2 1/2] t7505: Add tests for cherry-pick and rebase -i/-p

2018-01-23 Thread Phillip Wood
From: Phillip Wood Check that cherry-pick and rebase call the 'prepare-commit-msg' hook correctly. The expected values for the hook arguments are taken to match the current master branch. I think there is scope for improving the arguments passed so they make a bit more sense - for instance cherry