Merge branch 'pw/post-commit-from-sequencer' into jch

"rebase -i" ceased to run post-commit hook by mistake in an earlier
update, which has been corrected.

* pw/post-commit-from-sequencer:
  sequencer: run post-commit hook
  move run_commit_hook() to libgit and use it there
  sequencer.h fix placement of #endif
  t3404: remove uneeded calls to set_fake_editor
  t3404: set $EDITOR in subshell
  t3404: remove unnecessary subshell

diff --cc builtin/commit.c
Simple merge

diff --cc commit.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc sequencer.h
index 574260f6215f60e8c1aedb227c80a26c34da6c94,ac66892d7117aae68fcdb4553df1ca8c08aed3e8..9f9ae291e3c4ad8bc30abc3c68e18e413df9b6f6
--- 1/sequencer.h
--- 2/sequencer.h
+++ b/sequencer.h
@@@ -205,8 -198,7 +205,7 @@@ int read_author_script(const char *path
  void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
  int write_basic_state(struct replay_opts *opts, const char *head_name,
                      struct commit *onto, const char *orig_head);
 -void sequencer_post_commit_cleanup(struct repository *r);
 +void sequencer_post_commit_cleanup(struct repository *r, int verbose);
  int sequencer_get_last_command(struct repository* r,
                               enum replay_action *action);
+ #endif /* SEQUENCER_H */

diff --cc t/lib-rebase.sh
Simple merge

diff --cc t/t3404-rebase-interactive.sh
index d2dfbe46b9298719c41f35501d876c06c73235eb,c573c99069b44cb74b5bf1c48cd01a5f40a767c4..bf0dc756d2e6ab5b8626c04d76f21d03fb712b28
--- 1/t/t3404-rebase-interactive.sh
--- 2/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -225,13 -234,12 +229,15 @@@ test_expect_success 'reflog for the bra
  '
  
  test_expect_success 'exchange two commits' '
-       set_fake_editor &&
-       FAKE_LINES="2 1" git rebase -i HEAD~2 &&
+       (
+               set_fake_editor &&
+               FAKE_LINES="2 1" git rebase -i HEAD~2
+       ) &&
        test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 -      test G = $(git cat-file commit HEAD | sed -ne \$p)
 +      test G = $(git cat-file commit HEAD | sed -ne \$p) &&
 +      blob1=$(git rev-parse --short HEAD^:file1) &&
 +      blob2=$(git rev-parse --short HEAD:file1) &&
 +      commit=$(git rev-parse --short HEAD)
  '
  
  test_expect_success 'stop on conflicting pick' '
@@@ -249,10 -257,9 +255,9 @@@
        D
        =======
        G
 -      >>>>>>> 5d18e54... G
 +      >>>>>>> $commit... G
        EOF
        git tag new-branch1 &&
-       set_fake_editor &&
        test_must_fail git rebase -i master &&
        test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
        test_cmp expect .git/rebase-merge/patch &&
@@@ -999,9 -1059,11 +1057,11 @@@ test_expect_success 'rebase -i --root r
  
  test_expect_success 'rebase -i --root temporary sentinel commit' '
        git checkout B &&
-       set_fake_editor &&
-       test_must_fail env FAKE_LINES="2" git rebase -i --root &&
+       (
+               set_fake_editor &&
+               test_must_fail env FAKE_LINES="2" git rebase -i --root
+       ) &&
 -      git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
 +      git cat-file commit HEAD | grep "^tree $EMPTY_TREE" &&
        git rebase --abort
  '
  
@@@ -1065,9 -1137,11 +1135,11 @@@ test_expect_success C_LOCALE_OUTPUT 're
        git checkout reword-original-root-branch &&
        git reset --hard &&
        git checkout conflict-branch &&
-       set_fake_editor &&
-       test_must_fail git rebase -f --onto HEAD~2 HEAD~ &&
-       test_must_fail git rebase --edit-todo &&
+       (
+               set_fake_editor &&
 -              test_must_fail git rebase --onto HEAD~2 HEAD~ &&
++              test_must_fail git rebase -f --onto HEAD~2 HEAD~ &&
+               test_must_fail git rebase --edit-todo
+       ) &&
        git rebase --abort
  '
  
@@@ -1427,11 -1537,14 +1535,13 @@@ test_expect_success 'editor saves as CR
        )
  '
  
 -SQ="'"
  test_expect_success 'rebase -i --gpg-sign=<key-id>' '
        test_when_finished "test_might_fail git rebase --abort" &&
-       set_fake_editor &&
-       FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
-               >out 2>err &&
+       (
+               set_fake_editor &&
+               FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+                       HEAD^ >out 2>err
+       ) &&
        test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
  '