sequencer: start running post-commit hook again
cover sequencer: start running post-commit hook again
When I converted the sequencer to avoid forking git commit i forgot about the post-commit hook. These patches are based on pw/rebase-i-show-HEAD-to-reword, otherwise the new test fails as that branch changes the number of commits we make.
Phillip Wood (3):
sequencer.h fix placement of #endif
sequencer: use run_commit_hook()
sequencer: run post-commit hook
builtin/commit.c | 24 +---------------- commit.h | 3 --- sequencer.c | 50 +++++++++++++++++++++++++++-------- sequencer.h | 6 +++-- t/t3404-rebase-interactive.sh | 17 ++++++++++++ 5 files changed, 61 insertions(+), 39 deletions(-)
base-commit: b0a3186140dbc7bd64cbc6ef733386a0f1eb6a4d
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-388%2Fphillipwood%2Fwip%2Frebase-commit-hooks-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-388/phillipwood/wip/rebase-commit-hooks-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/388
Signature · 1 line
gitgitgadget
PATCH 1/3 sequencer.h fix placement of #endif
From: Phillip Wood <[email protected]>
Commit 65850686cf ("rebase -i: rewrite write_basic_state() in C", 2018-08-28) accidentially added new function declarations after the #endif at the end of the include guard.
--- sequencer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sequencer.h +1 -2
@@ -195,11 +195,10 @@ void print_commit_summary(struct repository *repo,int read_author_script (const char *path,char **name,char **email,char **date,int allow_missing); -#endif -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);int sequencer_get_last_command (struct repository * r,enum replay_action *action); +#endif /* SEQUENCER_H */
Signature · 1 line
gitgitgadget
PATCH 2/3 sequencer: use run_commit_hook()
In reply to Phillip Wood via GitGitGadgetFrom: Phillip Wood <[email protected]>
This simplifies the implementation of run_prepare_commit_msg_hook() and will be used in the next commit.
--- builtin/commit.c | 22 ---------------------- commit.h | 3 --- sequencer.c | 45 ++++++++++++++++++++++++++++++++++----------- sequencer.h | 2 ++ 4 files changed, 36 insertions(+), 36 deletions(-)
builtin/commit.c +0 -22
@@ -1443,28 +1443,6 @@ static int git_commit_config(const char *k, const char *v, void *cb)return git_status_config (k, v, s); } -int run_commit_hook (int editor_is_used,const char *index_file,const char *name, ...) -{ -struct argv_array hook_env =ARGV_ARRAY_INIT ; -va_list args; -int ret; - -argv_array_pushf (&hook_env,"GIT_INDEX_FILE=%s" , index_file); - -/* -* Let the hook know that no editor will be launched. -*/ -if (!editor_is_used) -argv_array_push (&hook_env,"GIT_EDITOR=:" ); - -va_start (args, name); - ret =run_hook_ve (hook_env.argv,name, args); -va_end (args); -argv_array_clear (&hook_env); - -return ret; -} -int cmd_commit (int argc,const char **argv,const char *prefix) {const char *argv_gc_auto[] = {"gc" ,"--auto" ,NULL };
commit.h +0 -3
@@ -389,7 +389,4 @@ void verify_merge_signature(struct commit *commit, int verbose);int compare_commits_by_commit_date (const void *a_,const void *b_,void *unused);int compare_commits_by_gen_then_commit_date (const void *a_,const void *b_,void *unused); -LAST_ARG_MUST_BE_NULL -int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); -#endif /* COMMIT_H */
sequencer.c +34 -11
62 lines not on this page · raw message
sequencer.h +2 -0
@@ -201,4 +201,6 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,void sequencer_post_commit_cleanup (struct repository *r);int sequencer_get_last_command (struct repository * r,enum replay_action *action); +LAST_ARG_MUST_BE_NULL +int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);#endif /* SEQUENCER_H */
Signature · 1 line
gitgitgadget
Re: [PATCH 2/3] sequencer: use run_commit_hook()
Hi Phillip,
Quoted 5 lines · Phillip Wood via GitGitGadget
From: Phillip Wood <[email protected]>
This simplifies the implementation of
run_prepare_commit_msg_hook()and will be used in the next commit.
Quoted 7 lines
Signed-off-by Phillip Wood <[email protected]>--- builtin/commit.c | 22 ---------------------- commit.h | 3 --- sequencer.c | 45 ++++++++++++++++++++++++++++++++++----------- sequencer.h | 2 ++ 4 files changed, 36 insertions(+), 36 deletions(-)
Hmm. I would have thought that commit.c would be a more logical home for that function (and that the declaration could remain in commit.h)?
The general thrust is good, of course: commit.h is supposedly a libgit.a header, but builtin/commit.o is _not_ included in libgit.a...
Thanks,
Dscho
Quoted 128 lines
builtin/commit.c +0
-22@@ -1443,28 +1443,6 @@ static int git_commit_config(const char *k, const char *v, void *cb)return git_status_config (k, v, s); } -int run_commit_hook (int editor_is_used,const char *index_file,const char *name, ...) -{ -struct argv_array hook_env =ARGV_ARRAY_INIT ; -va_list args; -int ret; - -argv_array_pushf (&hook_env,"GIT_INDEX_FILE=%s" , index_file); - -/* -* Let the hook know that no editor will be launched. -*/ -if (!editor_is_used) -argv_array_push (&hook_env,"GIT_EDITOR=:" ); - -va_start (args, name); - ret =run_hook_ve (hook_env.argv,name, args); -va_end (args); -argv_array_clear (&hook_env); - -return ret; -} -int cmd_commit (int argc,const char **argv,const char *prefix) {const char *argv_gc_auto[] = {"gc" ,"--auto" ,NULL };commit.h +0
-3@@ -389,7 +389,4 @@ void verify_merge_signature(struct commit *commit, int verbose);int compare_commits_by_commit_date (const void *a_,const void *b_,void *unused);int compare_commits_by_gen_then_commit_date (const void *a_,const void *b_,void *unused); -LAST_ARG_MUST_BE_NULL -int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); -#endif /* COMMIT_H */ sequencer.c +34
-11@@ -1123,28 +1123,51 @@ void commit_post_rewrite(struct repository *r,run_rewrite_hook (&old_head->object.oid, new_head); } +int run_commit_hook (int editor_is_used,const char *index_file, +const char *name, ...) +{ +struct argv_array hook_env =ARGV_ARRAY_INIT ; +va_list args; +int ret; + +argv_array_pushf (&hook_env,"GIT_INDEX_FILE=%s" , index_file); + +/* +* Let the hook know that no editor will be launched. +*/ +if (!editor_is_used) +argv_array_push (&hook_env,"GIT_EDITOR=:" ); + +va_start (args, name); + ret =run_hook_ve (hook_env.argv,name, args); +va_end (args); +argv_array_clear (&hook_env); + +return ret; +} +static int run_prepare_commit_msg_hook (struct repository *r,struct strbuf *msg,const char *commit) {struct argv_array hook_env =ARGV_ARRAY_INIT ; -int ret; -const char *name; +int ret =0 ; +const char *name, *arg1 =NULL , *arg2 =NULL ; name =git_path_commit_editmsg ();if (write_message (msg->buf, msg->len, name,0 ))return -1 ; -argv_array_pushf (&hook_env,"GIT_INDEX_FILE=%s" , r->index_file); -argv_array_push (&hook_env,"GIT_EDITOR=:" ); -if (commit) - ret =run_hook_le (hook_env.argv,"prepare-commit-msg" , name, -"commit" , commit,NULL ); -else - ret =run_hook_le (hook_env.argv,"prepare-commit-msg" , name, -"message" ,NULL ); -if (ret) +if (commit) { + arg1 ="commit" ; + arg2 = commit; + }else { + arg1 ="message" ; + } +if (run_commit_hook (0 , r->index_file,"prepare-commit-msg" , name, + arg1, arg2,NULL )) ret =error (_ ("'prepare-commit-msg' hook failed" )); +argv_array_clear (&hook_env);return ret;sequencer.h +2
-1@@ -201,4 +201,6 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,void sequencer_post_commit_cleanup (struct repository *r);int sequencer_get_last_command (struct repository * r,enum replay_action *action); +LAST_ARG_MUST_BE_NULL +int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);#endif /* SEQUENCER_H */ --gitgitgadget
Re: [PATCH 2/3] sequencer: use run_commit_hook()
Quoted 8 lines · Johannes Schindelin
Quoted 5 lines
builtin/commit.c | 22 ---------------------- commit.h | 3 --- sequencer.c | 45 ++++++++++++++++++++++++++++++++++----------- sequencer.h | 2 ++ 4 files changed, 36 insertions(+), 36 deletions(-)Hmm. I would have thought that
commit.cwould be a more logical home for that function (and that the declaration could remain incommit.h)?
Good correction.
Thanks.
Re: [PATCH 2/3] sequencer: use run_commit_hook()
Hi Dscho & Junio
Quoted 8 lines · Junio C Hamano
Quoted 6 lines · Johannes Schindelin
Quoted 5 lines
builtin/commit.c | 22 ---------------------- commit.h | 3 --- sequencer.c | 45 ++++++++++++++++++++++++++++++++++----------- sequencer.h | 2 ++ 4 files changed, 36 insertions(+), 36 deletions(-)
Quoted 4 lines
Quoted 2 lines
Hmm. I would have thought that
commit.cwould be a more logical home for that function (and that the declaration could remain incommit.h)?Good correction.
There are some other public commit related functions in sequencer.c - print_commit_summary(), commit_post_rewrite(), rest_is_empty(), cleanup_message(), message_is_empty(), template_untouched(), update_head_with_reflog() . Would you like to see them moved to commit.c (probably as a separate series)?
Best Wishes
Phillip
Quoted 3 lines
Thanks.
Re: [PATCH 2/3] sequencer: use run_commit_hook()
Hi Phillip,
Quoted 14 lines · Phillip Wood
Hi Dscho & Junio
Quoted 11 lines · Junio C Hamano
Quoted 8 lines · Johannes Schindelin
Quoted 5 lines
builtin/commit.c | 22 ---------------------- commit.h | 3 --- sequencer.c | 45 ++++++++++++++++++++++++++++++++++----------- sequencer.h | 2 ++ 4 files changed, 36 insertions(+), 36 deletions(-)Hmm. I would have thought that
commit.cwould be a more logical home for that function (and that the declaration could remain incommit.h)?
Quoted 7 lines
Quoted 1 line
Good correction.
There are some other public commit related functions in
sequencer.c-print_commit_summary(),commit_post_rewrite(),rest_is_empty(),cleanup_message(),message_is_empty(),template_untouched(),update_head_with_reflog(). Would you like to see them moved tocommit.c(probably as a separate series)?
I don't think that it is necessary to move any of those functions out of their existing habitat just yet. While I haven't looked more closely which of these functions are specific to the sequencer and which are more generic, I would argue that moving any of them is outside of the goals of your patch series.
Thanks,
Dscho
PATCH 3/3 sequencer: run post-commit hook
In reply to Phillip Wood via GitGitGadgetFrom: Phillip Wood <[email protected]>
Prior to commit 356ee4659b ("sequencer: try to commit without forking 'git commit'", 2017-11-24) the sequencer would always run the post-commit hook after each pick or revert as it forked git commit to create the commit. The conversion to committing without forking git commit omitted to call the post-commit hook after creating the commit.
--- builtin/commit.c | 2 +- sequencer.c | 5 +++++ sequencer.h | 1 + t/t3404-rebase-interactive.sh | 17 +++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)
builtin/commit.c +1 -1
@@ -1653,7 +1653,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)repo_rerere (the_repository,0 );run_command_v_opt (argv_gc_auto,RUN_GIT_CMD ); -run_commit_hook (use_editor,get_index_file (),"post-commit" ,NULL ); +run_post_commit_hook (use_editor,get_index_file ());if (amend && !no_post_rewrite) {commit_post_rewrite (the_repository, current_head, &oid); }
sequencer.c +5 -0
@@ -1173,6 +1173,10 @@ static int run_prepare_commit_msg_hook(struct repository *r,return ret; } +void run_post_commit_hook (int editor_is_used,const char *index_file) { +run_commit_hook (editor_is_used, index_file,"post-commit" ,NULL ); +} +static const char implicit_ident_advice_noconfig[] =N_ ("Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n"
@@ -1427,6 +1431,7 @@ static int try_to_commit(struct repository *r, goto out; } +run_post_commit_hook (0 , r->index_file);if (flags &AMEND_MSG )commit_post_rewrite (r, current_head, oid);
sequencer.h +1 -0
@@ -203,4 +203,5 @@ int sequencer_get_last_command(struct repository* r, enum replay_action *action);LAST_ARG_MUST_BE_NULL int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); +void run_post_commit_hook (int editor_is_used,const char *index_file);#endif /* SEQUENCER_H */
t/t3404-rebase-interactive.sh +17 -0
@@ -1467,4 +1467,21 @@ test_expect_success 'valid author header when author contains single quote' ' test_cmp expected actual ' +test_expect_success 'post-commit hook is called' ' + test_when_finished "rm -f .git/hooks/post-commit commits" && + mkdir -p .git/hooks && + write_script .git/hooks/post-commit <<-\EOS && + git rev-parse HEAD >>commits + EOS + set_fake_editor && + FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E && + echo x>file3 && + git add file3 && + FAKE_COMMIT_MESSAGE=edited git rebase --continue && + # rev-list does not support -g --reverse + git rev-list --no-walk=unsorted HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} \ + HEAD@{1} HEAD >expected && + test_cmp expected commits +' + test_done
Signature · 1 line
gitgitgadget
Re: [PATCH 3/3] sequencer: run post-commit hook
Hi Phillip,
Quoted 9 lines · Phillip Wood via GitGitGadget
From: Phillip Wood <[email protected]>
Prior to commit
356ee4659b("sequencer: try to commit without forking 'git commit'", 2017-11-24) the sequencer would always run the post-commit hook after each pick or revert as it forkedgit committo create the commit. The conversion to committing without forkinggit commitomitted to call the post-commit hook after creating the commit.Signed-off-by Phillip Wood <[email protected]>
Makes sense.
Quoted 12 lines
--- builtin/commit.c | 2 +- sequencer.c | 5 +++++ sequencer.h | 1 + t/t3404-rebase-interactive.sh | 17 +++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)builtin/commit.c +0
-0
builtin/commit.c int cmd_commit(int argc, const char **argv, const char *prefix) · line 1656
Quoted 5 lines
builtin/commit.c +1
-1@@ -1653,7 +1653,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)repo_rerere (the_repository,0 );run_command_v_opt (argv_gc_auto,RUN_GIT_CMD ); -run_commit_hook (use_editor,get_index_file (),"post-commit" ,NULL ); +run_post_commit_hook (use_editor,get_index_file ());
Does it really make sense to abstract the hook name away? It adds a lot of churn for just two callers...
Quoted 8 lines
builtin/commit.c +0
-0if (amend && !no_post_rewrite) {commit_post_rewrite (the_repository, current_head, &oid); }sequencer.c +0
-0
sequencer.c static int run_prepare_commit_msg_hook(struct repository *r, · line 1179
Quoted 7 lines
sequencer.c +4
-0@@ -1173,6 +1173,10 @@ static int run_prepare_commit_msg_hook(struct repository *r,return ret; } +void run_post_commit_hook (int editor_is_used,const char *index_file) { +run_commit_hook (editor_is_used, index_file,"post-commit" ,NULL ); +} +
If we must have a separate run_post_commit_hook(), then it should be an inline function, defined in the header. Or even a macro to begin with.
sequencer.c static int try_to_commit(struct repository *r, · line 1434
Quoted 8 lines
sequencer.c +1
-0static const char implicit_ident_advice_noconfig[] =N_ ("Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n"@@ -1427,6 +1431,7 @@ static int try_to_commit(struct repository *r, goto out; } +run_post_commit_hook (0 , r->index_file);
So this is the _actual_ change of this patch.
Quoted 18 lines
sequencer.c +0
-0if (flags &AMEND_MSG )commit_post_rewrite (r, current_head, oid);sequencer.h +1
-0@@ -203,4 +203,5 @@ int sequencer_get_last_command(struct repository* r, enum replay_action *action);LAST_ARG_MUST_BE_NULL int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); +void run_post_commit_hook (int editor_is_used,const char *index_file);#endif /* SEQUENCER_H */ t/t3404-rebase-interactive.sh +0
-0
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1474
Quoted 8 lines
t/t3404-rebase-interactive.sh +5
-0@@ -1467,4 +1467,21 @@ test_expect_success 'valid author header when author contains single quote' ' test_cmp expected actual ' +test_expect_success 'post-commit hook is called' ' + test_when_finished "rm -f .git/hooks/post-commit commits" && + mkdir -p .git/hooks && + write_script .git/hooks/post-commit <<-\EOS && + git rev-parse HEAD >>commits
Should commits be initialized before this script is written, e.g. using
>commits &&
?
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1476
Quoted 2 lines
t/t3404-rebase-interactive.sh +2
-0+ EOS + set_fake_editor &&
The set_fake_editor function sets a global environment variable, and therefore needs to be run in a subshell. Therefore, this line (as well as the next one) need to be enclosed in ( ... ).
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1478
Quoted 2 lines
t/t3404-rebase-interactive.sh +2
-0+ FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E && + echo x>file3 &&
We usually leave no space after the >, but we _do_ leave a space _before_ the >.
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1483
Quoted 5 lines
t/t3404-rebase-interactive.sh +5
-0+ git add file3 && + FAKE_COMMIT_MESSAGE=edited git rebase --continue && + # rev-list does not support -g --reverse + git rev-list --no-walk=unsorted HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} \ + HEAD@{1} HEAD >expected &&
Wouldn't this be better as:
git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
>expect &&t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1484
Quoted 1 line
t/t3404-rebase-interactive.sh +1
-0+ test_cmp expected commits
We usually use the name expect instead of expected in the test suite.
Thanks,
Dscho
Quoted 6 lines
t/t3404-rebase-interactive.sh +2
-1+' + test_done --gitgitgadget
Re: [PATCH 3/3] sequencer: run post-commit hook
Quoted 6 lines · Johannes Schindelin
Quoted 6 lines
builtin/commit.c +0
-0@@ -1653,7 +1653,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
Quoted 7 lines
builtin/commit.c int cmd_commit(int argc, const char **argv, const char *prefix) · line 1656
Quoted 4 lines
builtin/commit.c +1
-1repo_rerere (the_repository,0 );run_command_v_opt (argv_gc_auto,RUN_GIT_CMD ); -run_commit_hook (use_editor,get_index_file (),"post-commit" ,NULL ); +run_post_commit_hook (use_editor,get_index_file ());Does it really make sense to abstract the hook name away? It adds a lot of churn for just two callers...
After looking at the three patches, I do not think so.
Quoted 17 lines
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1474
Quoted 13 lines
t/t3404-rebase-interactive.sh +5
-0@@ -1467,4 +1467,21 @@ test_expect_success 'valid author header when author contains single quote' ' test_cmp expected actual ' +test_expect_success 'post-commit hook is called' ' + test_when_finished "rm -f .git/hooks/post-commit commits" && + mkdir -p .git/hooks && + write_script .git/hooks/post-commit <<-\EOS && + git rev-parse HEAD >>commitsShould
commitsbe initialized before this script is written, e.g. using
Quoted 1 line
>commits &&
Yes.
Quoted 8 lines
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1483
Quoted 2 lines
t/t3404-rebase-interactive.sh +2
-0+ git rev-list --no-walk=unsorted HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} \ + HEAD@{1} HEAD >expected &&Wouldn't this be better as:
git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \ >expect &&
Yes.
Quoted 4 lines
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1484
Quoted 1 line
t/t3404-rebase-interactive.sh +1
-0+ test_cmp expected commitsWe usually use the name
expectinstead ofexpectedin the test suite.
And the actual output file is called 'actual'.
Thanks.
Re: [PATCH 3/3] sequencer: run post-commit hook
In reply to Johannes SchindelinHi Dscho
Quoted 29 lines · Johannes Schindelin
Hi Phillip,
Quoted 9 lines · Phillip Wood via GitGitGadget
From: Phillip Wood <[email protected]>
Prior to commit
356ee4659b("sequencer: try to commit without forking 'git commit'", 2017-11-24) the sequencer would always run the post-commit hook after each pick or revert as it forkedgit committo create the commit. The conversion to committing without forkinggit commitomitted to call the post-commit hook after creating the commit.Signed-off-by Phillip Wood <[email protected]>Makes sense.
Quoted 13 lines
--- builtin/commit.c | 2 +- sequencer.c | 5 +++++ sequencer.h | 1 + t/t3404-rebase-interactive.sh | 17 +++++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-)builtin/commit.c +0
-0@@ -1653,7 +1653,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
Quoted 7 lines
builtin/commit.c int cmd_commit(int argc, const char **argv, const char *prefix) · line 1656
Quoted 4 lines
builtin/commit.c +1
-1repo_rerere (the_repository,0 );run_command_v_opt (argv_gc_auto,RUN_GIT_CMD ); -run_commit_hook (use_editor,get_index_file (),"post-commit" ,NULL ); +run_post_commit_hook (use_editor,get_index_file ());Does it really make sense to abstract the hook name away? It adds a lot of churn for just two callers...
I'll drop the new function in the reroll
Quoted 61 lines
Quoted 8 lines
builtin/commit.c +0
-0if (amend && !no_post_rewrite) {commit_post_rewrite (the_repository, current_head, &oid); }sequencer.c +0
-0sequencer.c static int run_prepare_commit_msg_hook(struct repository *r, · line 1179
Quoted 7 lines
sequencer.c +4
-0@@ -1173,6 +1173,10 @@ static int run_prepare_commit_msg_hook(struct repository *r,return ret; } +void run_post_commit_hook (int editor_is_used,const char *index_file) { +run_commit_hook (editor_is_used, index_file,"post-commit" ,NULL ); +} +If we must have a separate
run_post_commit_hook(), then it should be aninlinefunction, defined in the header. Or even a macro to begin with.sequencer.c static int try_to_commit(struct repository *r, · line 1434
Quoted 8 lines
sequencer.c +1
-0static const char implicit_ident_advice_noconfig[] =N_ ("Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n"@@ -1427,6 +1431,7 @@ static int try_to_commit(struct repository *r, goto out; } +run_post_commit_hook (0 , r->index_file);So this is the _actual_ change of this patch.
Quoted 18 lines
sequencer.c +0
-0if (flags &AMEND_MSG )commit_post_rewrite (r, current_head, oid);sequencer.h +1
-0@@ -203,4 +203,5 @@ int sequencer_get_last_command(struct repository* r, enum replay_action *action);LAST_ARG_MUST_BE_NULL int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); +void run_post_commit_hook (int editor_is_used,const char *index_file);#endif /* SEQUENCER_H */ t/t3404-rebase-interactive.sh +0
-0t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1474
Quoted 8 lines
t/t3404-rebase-interactive.sh +5
-0@@ -1467,4 +1467,21 @@ test_expect_success 'valid author header when author contains single quote' ' test_cmp expected actual ' +test_expect_success 'post-commit hook is called' ' + test_when_finished "rm -f .git/hooks/post-commit commits" && + mkdir -p .git/hooks && + write_script .git/hooks/post-commit <<-\EOS && + git rev-parse HEAD >>commitsShould
commitsbe initialized before this script is written, e.g. using
Quoted 1 line
>commits &&
Good point, especially if it is renamed to actual as Junio suggests
Quoted 6 lines
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1476
Quoted 2 lines
t/t3404-rebase-interactive.sh +2
-0+ EOS + set_fake_editor &&The
set_fake_editorfunction sets a global environment variable, and therefore needs to be run in a subshell. Therefore, this line (as well as the next one) need to be enclosed in( ... ).
There are ~80 instances of set_fake_editor/test_set_editor/set_cat_todo_editor in that file that are not in subshells. I've converted them in a preparatory patch (that was fun), removing about 20 that can now safely rely on EDITOR=: (hopefully that will ameliorate the performance hit of ~60 extra subshells a little)
Quoted 14 lines
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1478
Quoted 2 lines
t/t3404-rebase-interactive.sh +2
-0+ FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E && + echo x>file3 &&We usually leave no space after the
>, but we _do_ leave a space _before_ the>.t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1483
Quoted 5 lines
t/t3404-rebase-interactive.sh +5
-0+ git add file3 && + FAKE_COMMIT_MESSAGE=edited git rebase --continue && + # rev-list does not support -g --reverse + git rev-list --no-walk=unsorted HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} \ + HEAD@{1} HEAD >expected &&Wouldn't this be better as:
Quoted 2 lines
git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
>expect &&Good point
Quoted 4 lines
t/t3404-rebase-interactive.sh test_expect_success 'valid author header when author contains single quote' ' · line 1484
Quoted 1 line
t/t3404-rebase-interactive.sh +1
-0+ test_cmp expected commitsWe usually use the name
expectinstead ofexpectedin the test suite.
OK
Thanks for looking at this series
Phillip
Quoted 9 lines
Thanks,
DschoQuoted 6 lines
t/t3404-rebase-interactive.sh +2
-1+' + test_done --gitgitgadget
v2 cover sequencer: start running post-commit hook again
In reply to Phillip Wood via GitGitGadgetWhen I converted the sequencer to avoid forking git commit i forgot about the post-commit hook. These patches are based on pw/rebase-i-show-HEAD-to-reword, otherwise the new test fails as that branch changes the number of commits we make.
Thanks to Dscho & Junio for their comments on V1. I've made the following changes:
Patches 1-3 These are new patches in response to Dscho's request to set $EDITOR in a subshell. There were ~80 other tests that weren't doing that and they are fixed in these patches. Patch 2 contains the main action, unfortunately due to a combination of having to remove the trailing ' &&' from the last line moved into the subshell and re-wrapping some lines due to the increased indentation --color-moved and --color-moved-ws are of limited use when viewing this patch.
Patch 4 (was 1) Unchanged
Patch 5 (was 2) I've moved the function definition to commit.c rather than sequencer.c as suggested. I've also removed an unused struct argv_array from run_prepare_commit_msg_hook() (There wasn't a compiler warning as it was still calling argv_array_clear() at the end of the function) and reworded the commit message.
Patch 6 (was 3) I've tided up the test and removed the wrapper function for running the post-commit hook as suggested.
Phillip Wood (6):
t3404: remove unnecessary subshell
t3404: set $EDITOR in subshell
t3404: remove uneeded calls to set_fake_editor sequencer.h fix placement of #endif
move run_commit_hook() to libgit and use it there
sequencer: run post-commit hook
builtin/commit.c | 22 -- commit.c | 24 ++ sequencer.c | 24 +- sequencer.h | 3 +- t/lib-rebase.sh | 28 ++ t/t3404-rebase-interactive.sh | 596 +++++++++++++++++++++------------- 6 files changed, 432 insertions(+), 265 deletions(-)
base-commit: b0a3186140dbc7bd64cbc6ef733386a0f1eb6a4d
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-388%2Fphillipwood%2Fwip%2Frebase-commit-hooks-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-388/phillipwood/wip/rebase-commit-hooks-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/388
Range-diff vs v1:
-: ---------- > 1: b9689e85e5 t3404: remove unnecessary subshell -: ---------- > 2: 96432cd0f0 t3404: set $EDITOR in subshell -: ---------- > 3: 09857dee78 t3404: remove uneeded calls to set_fake_editor 1: 7305f8d8e8 = 4: 0eac3ede02 sequencer.h fix placement of #endif 2: 420ecf442c ! 5: f394a0e163 sequencer: use run_commit_hook()
@@ -1,9 +1,11 @@
Author: Phillip Wood <[email protected]>
- sequencer: use run_commit_hook()
+ move run_commit_hook() to libgit and use it there
- This simplifies the implementation of run_prepare_commit_msg_hook() and
- will be used in the next commit.
+ This function was declared in commit.h but was implemented in
+ builtin/commit.c so was not part of libgit. Move it to libgit so we can
+ use it in the sequencer. This simplifies the implementation of
+ run_prepare_commit_msg_hook() and will be used in the next commit.
@@ -40,25 +42,22 @@
{
const char *argv_gc_auto[] = {"gc", "--auto", NULL};
- diff --git a/commit.h b/commit.h
- --- a/commit.h
- +++ b/commit.h
+ diff --git a/commit.c b/commit.c
+ --- a/commit.c
+ +++ b/commit.c
@@
- int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
- int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
+ #include "advice.h"
+ #include "refs.h"
+ #include "commit-reach.h"
++#include "run-command.h"
+
+ static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
--LAST_ARG_MUST_BE_NULL
--int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); --
- #endif /* COMMIT_H */
-
- diff --git a/sequencer.c b/sequencer.c
- --- a/sequencer.c
- +++ b/sequencer.c
@@
- run_rewrite_hook(&old_head->object.oid, new_head);
+ }
+ return boc ? len - boc : len - cutoff;
}
-
++
+int run_commit_hook(int editor_is_used, const char *index_file,
+ const char *name, ...)
+{
@@ -81,12 +80,15 @@
+
+ return ret;
+}
-+
- static int run_prepare_commit_msg_hook(struct repository *r,
+
+ diff --git a/sequencer.c b/sequencer.c
+ --- a/sequencer.c
+ +++ b/sequencer.c
+@@
struct strbuf *msg,
const char *commit)
{
- struct argv_array hook_env = ARGV_ARRAY_INIT;
+- struct argv_array hook_env = ARGV_ARRAY_INIT;
- int ret;
- const char *name;
+ int ret = 0;
@@ -114,18 +116,7 @@
+ if (run_commit_hook(0, r->index_file, "prepare-commit-msg", name,
+ arg1, arg2, NULL))
ret = error(_("'prepare-commit-msg' hook failed"));
-+
- argv_array_clear(&hook_env);
+- argv_array_clear(&hook_env);
return ret;
-
- diff --git a/sequencer.h b/sequencer.h
- --- a/sequencer.h
- +++ b/sequencer.h
-@@
- void sequencer_post_commit_cleanup(struct repository *r);
- int sequencer_get_last_command(struct repository* r,
- enum replay_action *action);
-+LAST_ARG_MUST_BE_NULL
-+int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
- #endif /* SEQUENCER_H */
+ }
3: acaa086a48 ! 6: 67a711754e sequencer: run post-commit hook
@@ -10,52 +10,18 @@
Signed-off-by: Phillip Wood <[email protected]>
- diff --git a/builtin/commit.c b/builtin/commit.c
- --- a/builtin/commit.c
- +++ b/builtin/commit.c
-@@
-
- repo_rerere(the_repository, 0);
- run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
-- run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
-+ run_post_commit_hook(use_editor, get_index_file());
- if (amend && !no_post_rewrite) {
- commit_post_rewrite(the_repository, current_head, &oid);
- }
-
diff --git a/sequencer.c b/sequencer.c
--- a/sequencer.c
+++ b/sequencer.c
-@@
- return ret;
- }
-
-+void run_post_commit_hook(int editor_is_used, const char *index_file) {
-+ run_commit_hook(editor_is_used, index_file, "post-commit", NULL);
-+}
-+
- static const char implicit_ident_advice_noconfig[] =
- N_("Your name and email address were configured automatically based\n"
- "on your username and hostname. Please check that they are accurate.\n"
@@
goto out;
}
-+ run_post_commit_hook(0, r->index_file);
++ run_commit_hook(0, r->index_file, "post-commit", NULL);
if (flags & AMEND_MSG)
commit_post_rewrite(r, current_head, oid);
- diff --git a/sequencer.h b/sequencer.h
- --- a/sequencer.h
- +++ b/sequencer.h
-@@
- enum replay_action *action);
- LAST_ARG_MUST_BE_NULL
- int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
-+void run_post_commit_hook(int editor_is_used, const char *index_file);
- #endif /* SEQUENCER_H */
-
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -64,20 +30,24 @@
'
+test_expect_success 'post-commit hook is called' '
-+ test_when_finished "rm -f .git/hooks/post-commit commits" &&
++ test_when_finished "rm -f .git/hooks/post-commit" &&
++ >actual &&
+ mkdir -p .git/hooks &&
+ write_script .git/hooks/post-commit <<-\EOS &&
-+ git rev-parse HEAD >>commits
++ git rev-parse HEAD >>actual
+ EOS
-+ set_fake_editor &&
-+ FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E &&
-+ echo x>file3 &&
-+ git add file3 &&
-+ FAKE_COMMIT_MESSAGE=edited git rebase --continue &&
-+ # rev-list does not support -g --reverse
-+ git rev-list --no-walk=unsorted HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} \
-+ HEAD@{1} HEAD >expected &&
-+ test_cmp expected commits
++ (
++ set_fake_editor &&
++ FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E &&
++ echo x>file3 &&
++ git add file3 &&
++ FAKE_COMMIT_MESSAGE=edited git rebase --continue
++ ) &&
++ git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
++ >expect &&
++ test_cmp expect actual
+'
+
- test_done
+ # This must be the last test in this file
+ test_expect_success '$EDITOR and friends are unchanged' '
+ test_editor_unchangedSignature · 1 line
gitgitgadget
PATCH v2 1/6 t3404: remove unnecessary subshell
From: Phillip Wood <[email protected]>
Neither of the commands executed in the subshell change any shell variables or the current directory so there is no need for them to be executed in a subshell.
--- t/t3404-rebase-interactive.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
t/t3404-rebase-interactive.sh +2 -4
@@ -945,10 +945,8 @@ test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' ' git add bis.txt && git commit -m "fixup! two_exec" && set_fake_editor && - ( - git checkout -b autosquash_actual && - git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual - ) && + git checkout -b autosquash_actual && + git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual && git checkout autosquash && ( git checkout -b autosquash_expected &&
Signature · 1 line
gitgitgadget
PATCH v2 2/6 t3404: set $EDITOR in subshell
In reply to Phillip Wood via GitGitGadgetFrom: Phillip Wood <[email protected]>
As $EDITOR is exported setting it in one test affects all subsequent tests. Avoid this by always setting it in a subshell. This commit leaves 20 calls to set_fake_editor that are not in subshells as they can safely be removed in the next commit once all the other editor setting is done inside subshells.
I have moved the call to set_fake_editor in some tests so it comes immediately before the call to 'git rebase' to avoid moving unrelated commands into the subshell. In one case ('rebase -ix with --autosquash') the call to set_fake_editor is moved past an invocation of 'git rebase'. This is safe as that invocation of 'git rebase' requires EDITOR=: or EDITOR=fake-editor.sh without FAKE_LINES being set which will be the case as the preceding tests either set their editor in a subshell or call set_fake_editor without setting FAKE_LINES.
In a one test ('auto-amend only edited commits after "edit"') a call to test_tick are now in a subshell. I think this is OK as it is there to set the date for the next commit which is executed in the same subshell rather than updating GIT_COMMITTER_DATE for later tests (the next test calls test_tick before doing anything else).
--- t/t3404-rebase-interactive.sh | 546 +++++++++++++++++++++------------- 1 file changed, 342 insertions(+), 204 deletions(-)
t/t3404-rebase-interactive.sh +342 -204
@@ -79,8 +79,11 @@ test_expect_success 'rebase -i with empty HEAD' ' cat >expect <<-\EOF && error: nothing to do EOF - set_fake_editor && - test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 exec_true" \ + git rebase -i HEAD^ >actual 2>&1 + ) && test_i18ncmp expect actual '
@@ -139,8 +142,11 @@ test_expect_success 'rebase -i sets work tree properly' ' test_expect_success 'rebase -i with the exec command checks tree cleanness' ' git checkout master && - set_fake_editor && - test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \ + git rebase -i HEAD^ + ) && test_cmp_rev master^ HEAD && git reset --hard && git rebase --continue
@@ -168,9 +174,11 @@ test_expect_success 'rebase -x with newline in command fails' ' test_expect_success 'rebase -i with exec of inexistent command' ' git checkout master && test_when_finished "git rebase --abort" && - set_fake_editor && - test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \ - git rebase -i HEAD^ >actual 2>&1 && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \ + git rebase -i HEAD^ >actual 2>&1 + ) && ! grep "Maybe git-rebase is broken" actual '
@@ -230,8 +238,10 @@ test_expect_success 'reflog for the branch shows correct finish message' ' ' 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) '
@@ -332,9 +342,11 @@ test_expect_success 'squash' ' test_tick && GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 && echo "******************************" && - set_fake_editor && - FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \ - git rebase -i --onto master HEAD~2 && + ( + set_fake_editor && + FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \ + git rebase -i --onto master HEAD~2 + ) && test B = $(cat file7) && test $(git rev-parse HEAD^) = $(git rev-parse master) '
@@ -355,8 +367,10 @@ test_expect_success REBASE_P '-p handles "no changes" gracefully' ' test_expect_failure REBASE_P 'exchange two commits with -p' ' git checkout H && - set_fake_editor && - FAKE_LINES="2 1" git rebase -i -p HEAD~2 && + ( + set_fake_editor && + FAKE_LINES="2 1" git rebase -i -p HEAD~2 + ) && test H = $(git cat-file commit HEAD^ | sed -ne \$p) && test G = $(git cat-file commit HEAD | sed -ne \$p) '
@@ -405,8 +419,10 @@ test_expect_success REBASE_P 'preserve merges with -p' ' ' test_expect_success REBASE_P 'edit ancestor with -p' ' - set_fake_editor && - FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 && + ( + set_fake_editor && + FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 + ) && echo 2 > unrelated-file && test_tick && git commit -m L2-modified --amend unrelated-file &&
@@ -420,11 +436,13 @@ test_expect_success REBASE_P 'edit ancestor with -p' ' test_expect_success '--continue tries to commit' ' git reset --hard D && test_tick && - set_fake_editor && - test_must_fail git rebase -i --onto new-branch1 HEAD^ && - echo resolved > file1 && - git add file1 && - FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue && + ( + set_fake_editor && + test_must_fail git rebase -i --onto new-branch1 HEAD^ && + echo resolved > file1 && + git add file1 && + FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue + ) && test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) && git show HEAD | grep chouette '
@@ -442,10 +460,13 @@ test_expect_success 'verbose flag is heeded, even after --continue' ' test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' ' base=$(git rev-parse HEAD~4) && - set_fake_editor && - FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \ - EXPECT_HEADER_COUNT=4 \ - git rebase -i $base && + ( + set_fake_editor && + FAKE_COMMIT_AMEND="ONCE" \ + FAKE_LINES="1 squash 2 squash 3 squash 4" \ + EXPECT_HEADER_COUNT=4 \ + git rebase -i $base + ) && test $base = $(git rev-parse HEAD^) && test 1 = $(git show | grep ONCE | wc -l) '
@@ -453,9 +474,12 @@ test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' ' test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' ' git checkout -b multi-fixup E && base=$(git rev-parse HEAD~4) && - set_fake_editor && - FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \ - git rebase -i $base && + ( + set_fake_editor && + FAKE_COMMIT_AMEND="NEVER" \ + FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \ + git rebase -i $base + ) && test $base = $(git rev-parse HEAD^) && test 0 = $(git show | grep NEVER | wc -l) && git checkout @{-1} &&
@@ -465,12 +489,15 @@ test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' ' test_expect_success 'commit message used after conflict' ' git checkout -b conflict-fixup conflict-branch && base=$(git rev-parse HEAD~4) && - set_fake_editor && - test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base && - echo three > conflict && - git add conflict && - FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \ - git rebase --continue && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" \ + git rebase -i $base && + echo three > conflict && + git add conflict && + FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \ + git rebase --continue + ) && test $base = $(git rev-parse HEAD^) && test 1 = $(git show | grep ONCE | wc -l) && git checkout @{-1} &&
@@ -480,12 +507,15 @@ test_expect_success 'commit message used after conflict' ' test_expect_success 'commit message retained after conflict' ' git checkout -b conflict-squash conflict-branch && base=$(git rev-parse HEAD~4) && - set_fake_editor && - test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base && - echo three > conflict && - git add conflict && - FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \ - git rebase --continue && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 fixup 3 squash 4" \ + git rebase -i $base && + echo three > conflict && + git add conflict && + FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \ + git rebase --continue + ) && test $base = $(git rev-parse HEAD^) && test 2 = $(git show | grep TWICE | wc -l) && git checkout @{-1} &&
@@ -502,10 +532,13 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa EOF git checkout -b squash-fixup E && base=$(git rev-parse HEAD~4) && - set_fake_editor && - FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \ - EXPECT_HEADER_COUNT=4 \ - git rebase -i $base && + ( + set_fake_editor && + FAKE_COMMIT_AMEND="ONCE" \ + FAKE_LINES="1 fixup 2 squash 3 fixup 4" \ + EXPECT_HEADER_COUNT=4 \ + git rebase -i $base + ) && git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup && test_cmp expect-squash-fixup actual-squash-fixup && git cat-file commit HEAD@{2} |
@@ -519,10 +552,13 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' ' git checkout -b skip-comments E && base=$(git rev-parse HEAD~4) && - set_fake_editor && - FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \ - EXPECT_HEADER_COUNT=4 \ - git rebase -i $base && + ( + set_fake_editor && + FAKE_COMMIT_AMEND="ONCE" \ + FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \ + EXPECT_HEADER_COUNT=4 \ + git rebase -i $base + ) && test $base = $(git rev-parse HEAD^) && test 1 = $(git show | grep ONCE | wc -l) && git checkout @{-1} &&
@@ -532,10 +568,13 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' ' test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' ' git checkout -b skip-blank-lines E && base=$(git rev-parse HEAD~4) && - set_fake_editor && - FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \ - EXPECT_HEADER_COUNT=4 \ - git rebase -i $base && + ( + set_fake_editor && + FAKE_COMMIT_AMEND="ONCE" \ + FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \ + EXPECT_HEADER_COUNT=4 \ + git rebase -i $base + ) && test $base = $(git rev-parse HEAD^) && test 1 = $(git show | grep ONCE | wc -l) && git checkout @{-1} &&
@@ -545,17 +584,21 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' ' test_expect_success 'squash works as expected' ' git checkout -b squash-works no-conflict-branch && one=$(git rev-parse HEAD~3) && - set_fake_editor && - FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 \ - git rebase -i HEAD~3 && + ( + set_fake_editor && + FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 git rebase -i HEAD~3 + ) && test $one = $(git rev-parse HEAD~2) ' test_expect_success 'interrupted squash works as expected' ' git checkout -b interrupted-squash conflict-branch && one=$(git rev-parse HEAD~3) && - set_fake_editor && - test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 squash 3 2" \ + git rebase -i HEAD~3 + ) && test_write_lines one two four > conflict && git add conflict && test_must_fail git rebase --continue &&
@@ -568,8 +611,11 @@ test_expect_success 'interrupted squash works as expected' ' test_expect_success 'interrupted squash works as expected (case 2)' ' git checkout -b interrupted-squash2 conflict-branch && one=$(git rev-parse HEAD~3) && - set_fake_editor && - test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="3 squash 1 2" \ + git rebase -i HEAD~3 + ) && test_write_lines one four > conflict && git add conflict && test_must_fail git rebase --continue &&
@@ -589,11 +635,13 @@ test_expect_success '--continue tries to commit, even for "edit"' ' git commit -m "unrelated change" && parent=$(git rev-parse HEAD^) && test_tick && - set_fake_editor && - FAKE_LINES="edit 1" git rebase -i HEAD^ && - echo edited > file7 && - git add file7 && - FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue && + ( + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i HEAD^ && + echo edited > file7 && + git add file7 && + FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue + ) && test edited = $(git show HEAD:file7) && git show HEAD | grep chouette && test $parent = $(git rev-parse HEAD^)
@@ -602,34 +650,41 @@ test_expect_success '--continue tries to commit, even for "edit"' ' test_expect_success 'aborted --continue does not squash commits after "edit"' ' old=$(git rev-parse HEAD) && test_tick && - set_fake_editor && - FAKE_LINES="edit 1" git rebase -i HEAD^ && - echo "edited again" > file7 && - git add file7 && - test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue && + ( + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i HEAD^ && + echo "edited again" > file7 && + git add file7 && + test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue + ) && test $old = $(git rev-parse HEAD) && git rebase --abort ' test_expect_success 'auto-amend only edited commits after "edit"' ' test_tick && - set_fake_editor && - FAKE_LINES="edit 1" git rebase -i HEAD^ && - echo "edited again" > file7 && - git add file7 && - FAKE_COMMIT_MESSAGE="edited file7 again" git commit && - echo "and again" > file7 && - git add file7 && - test_tick && - test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue && + ( + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i HEAD^ && + echo "edited again" > file7 && + git add file7 && + FAKE_COMMIT_MESSAGE="edited file7 again" git commit && + echo "and again" > file7 && + git add file7 && + test_tick && + test_must_fail env FAKE_COMMIT_MESSAGE="and again" \ + git rebase --continue + ) && git rebase --abort ' test_expect_success 'clean error after failed "exec"' ' test_tick && test_when_finished "git rebase --abort || :" && - set_fake_editor && - test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ + ) && echo "edited again" > file7 && git add file7 && test_must_fail git rebase --continue 2>error &&
@@ -640,8 +695,10 @@ test_expect_success 'rebase a detached HEAD' ' grandparent=$(git rev-parse HEAD~2) && git checkout $(git rev-parse HEAD) && test_tick && - 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 $grandparent = $(git rev-parse HEAD~2) '
@@ -656,9 +713,10 @@ test_expect_success 'rebase a commit violating pre-commit' ' test_must_fail git commit -m doesnt-verify file1 && git commit -m doesnt-verify --no-verify file1 && test_tick && - set_fake_editor && - FAKE_LINES=2 git rebase -i HEAD~2 - + ( + set_fake_editor && + FAKE_LINES=2 git rebase -i HEAD~2 + ) ' test_expect_success 'rebase with a file named HEAD in worktree' '
@@ -678,8 +736,10 @@ test_expect_success 'rebase with a file named HEAD in worktree' ' git commit -m "Add body" ) && - set_fake_editor && - FAKE_LINES="1 squash 2" git rebase -i @{-1} && + ( + set_fake_editor && + FAKE_LINES="1 squash 2" git rebase -i @{-1} + ) && test "$(git show -s --pretty=format:%an)" = "Squashed Away" '
@@ -720,8 +780,10 @@ test_expect_success 'submodule rebase setup' ' ' test_expect_success 'submodule rebase -i' ' - set_fake_editor && - FAKE_LINES="1 squash 2 3" git rebase -i A + ( + set_fake_editor && + FAKE_LINES="1 squash 2 3" git rebase -i A + ) ' test_expect_success 'submodule conflict setup' '
@@ -770,16 +832,22 @@ test_expect_success 'avoid unnecessary reset' ' test_expect_success 'reword' ' git checkout -b reword-branch master && - set_fake_editor && - FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A && - git show HEAD | grep "E changed" && - test $(git rev-parse master) != $(git rev-parse HEAD) && - test $(git rev-parse master^) = $(git rev-parse HEAD^) && - FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A && - git show HEAD^ | grep "D changed" && - FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A && - git show HEAD~3 | grep "B changed" && - FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A && + ( + set_fake_editor && + FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \ + git rebase -i A && + git show HEAD | grep "E changed" && + test $(git rev-parse master) != $(git rev-parse HEAD) && + test $(git rev-parse master^) = $(git rev-parse HEAD^) && + FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \ + git rebase -i A && + git show HEAD^ | grep "D changed" && + FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \ + git rebase -i A && + git show HEAD~3 | grep "B changed" && + FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \ + git rebase -i A + ) && git show HEAD~2 | grep "C changed" '
@@ -803,8 +871,11 @@ test_expect_success 'rebase -i can copy notes over a fixup' ' EOF git reset --hard n3 && git notes add -m"an earlier note" n2 && - set_fake_editor && - GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" git rebase -i n1 && + ( + set_fake_editor && + GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" \ + git rebase -i n1 + ) && git notes show > output && test_cmp expect output '
@@ -813,8 +884,10 @@ test_expect_success 'rebase while detaching HEAD' ' git symbolic-ref HEAD && grandparent=$(git rev-parse HEAD~2) && test_tick && - set_fake_editor && - FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 && + ( + set_fake_editor && + FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 + ) && test $grandparent = $(git rev-parse HEAD~2) && test_must_fail git symbolic-ref HEAD '
@@ -855,8 +928,10 @@ test_expect_success 'set up commits with funny messages' ' test_expect_success 'rebase-i history with funny messages' ' git rev-list A..funny >expect && test_tick && - set_fake_editor && - FAKE_LINES="1 2 3 4" git rebase -i A && + ( + set_fake_editor && + FAKE_LINES="1 2 3 4" git rebase -i A + ) && git rev-list A.. >actual && test_cmp expect actual '
@@ -870,9 +945,9 @@ test_expect_success 'prepare for rebase -i --exec' ' ' test_expect_success 'running "git rebase -i --exec git show HEAD"' ' - set_fake_editor && - git rebase -i --exec "git show HEAD" HEAD~2 >actual && ( + set_fake_editor && + git rebase -i --exec "git show HEAD" HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" && export FAKE_LINES && git rebase -i HEAD~2 >expect
@@ -883,9 +958,9 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' ' test_expect_success 'running "git rebase --exec git show HEAD -i"' ' git reset --hard execute && - set_fake_editor && - git rebase --exec "git show HEAD" -i HEAD~2 >actual && ( + set_fake_editor && + git rebase --exec "git show HEAD" -i HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" && export FAKE_LINES && git rebase -i HEAD~2 >expect
@@ -896,9 +971,9 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' ' test_expect_success 'running "git rebase -ix git show HEAD"' ' git reset --hard execute && - set_fake_editor && - git rebase -ix "git show HEAD" HEAD~2 >actual && ( + set_fake_editor && + git rebase -ix "git show HEAD" HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" && export FAKE_LINES && git rebase -i HEAD~2 >expect
@@ -910,9 +985,9 @@ test_expect_success 'running "git rebase -ix git show HEAD"' ' test_expect_success 'rebase -ix with several <CMD>' ' git reset --hard execute && - set_fake_editor && - git rebase -ix "git show HEAD; pwd" HEAD~2 >actual && ( + set_fake_editor && + git rebase -ix "git show HEAD; pwd" HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" && export FAKE_LINES && git rebase -i HEAD~2 >expect
@@ -923,9 +998,9 @@ test_expect_success 'rebase -ix with several <CMD>' ' test_expect_success 'rebase -ix with several instances of --exec' ' git reset --hard execute && - set_fake_editor && - git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual && ( + set_fake_editor && + git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2 exec_git_show_HEAD exec_pwd" && export FAKE_LINES &&
@@ -944,11 +1019,11 @@ test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' ' echo bis >bis.txt && git add bis.txt && git commit -m "fixup! two_exec" && - set_fake_editor && git checkout -b autosquash_actual && git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual && git checkout autosquash && ( + set_fake_editor && git checkout -b autosquash_expected && FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" && export FAKE_LINES &&
@@ -977,8 +1052,10 @@ test_expect_success 'rebase -i --exec without <CMD>' ' test_expect_success 'rebase -i --root re-order and drop commits' ' git checkout E && - set_fake_editor && - FAKE_LINES="3 1 2 5" git rebase -i --root && + ( + set_fake_editor && + FAKE_LINES="3 1 2 5" git rebase -i --root + ) && test E = $(git cat-file commit HEAD | sed -ne \$p) && test B = $(git cat-file commit HEAD^ | sed -ne \$p) && test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
@@ -991,24 +1068,30 @@ test_expect_success 'rebase -i --root retain root commit author and message' ' echo B >file7 && git add file7 && GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" && - set_fake_editor && - FAKE_LINES="2" git rebase -i --root && + ( + set_fake_editor && + FAKE_LINES="2" git rebase -i --root + ) && git cat-file commit HEAD | grep -q "^author Twerp Snog" && git cat-file commit HEAD | grep -q "^different author$" ' 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 rebase --abort ' test_expect_success 'rebase -i --root fixup root commit' ' git checkout B && - set_fake_editor && - FAKE_LINES="1 fixup 2" git rebase -i --root && + ( + set_fake_editor && + FAKE_LINES="1 fixup 2" git rebase -i --root + ) && test A = $(git cat-file commit HEAD | sed -ne \$p) && test B = $(git show HEAD:file1) && test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
@@ -1017,9 +1100,11 @@ test_expect_success 'rebase -i --root fixup root commit' ' test_expect_success 'rebase -i --root reword original root commit' ' test_when_finished "test_might_fail git rebase --abort" && git checkout -b reword-original-root-branch master && - set_fake_editor && - FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \ - git rebase -i --root && + ( + set_fake_editor && + FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \ + git rebase -i --root + ) && git show HEAD^ | grep "A changed" && test -z "$(git show -s --format=%p HEAD^)" '
@@ -1027,9 +1112,11 @@ test_expect_success 'rebase -i --root reword original root commit' ' test_expect_success 'rebase -i --root reword new root commit' ' test_when_finished "test_might_fail git rebase --abort" && git checkout -b reword-now-root-branch master && - set_fake_editor && - FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \ - git rebase -i --root && + ( + set_fake_editor && + FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \ + git rebase -i --root + ) && git show HEAD^ | grep "C changed" && test -z "$(git show -s --format=%p HEAD^)" '
@@ -1041,8 +1128,10 @@ test_expect_success 'rebase -i --root when root has untracked file conflict' ' git rm file1 && git commit -m "remove file 1 add file 2" && echo z >file1 && - set_fake_editor && - test_must_fail env FAKE_LINES="1 2" git rebase -i --root && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 2" git rebase -i --root + ) && rm file1 && git rebase --continue && test "$(git log -1 --format=%B)" = "remove file 1 add file 2" &&
@@ -1052,11 +1141,13 @@ test_expect_success 'rebase -i --root when root has untracked file conflict' ' test_expect_success 'rebase -i --root reword root when root has untracked file conflict' ' test_when_finished "reset_rebase" && echo z>file1 && - set_fake_editor && - test_must_fail env FAKE_LINES="reword 1 2" \ - FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root && - rm file1 && - FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="reword 1 2" \ + FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root && + rm file1 && + FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue + ) && test "$(git log -1 --format=%B HEAD^)" = "Reworded A" && test "$(git rev-list --count HEAD)" = 2 '
@@ -1065,19 +1156,23 @@ test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-int git checkout reword-original-root-branch && git reset --hard && git checkout conflict-branch && - set_fake_editor && - test_must_fail git rebase --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 --edit-todo + ) && git rebase --abort ' test_expect_success 'rebase --edit-todo can be used to modify todo' ' git reset --hard && git checkout no-conflict-branch^0 && - set_fake_editor && - FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 && - FAKE_LINES="2 1" git rebase --edit-todo && - git rebase --continue && + ( + set_fake_editor && + FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 && + FAKE_LINES="2 1" git rebase --edit-todo && + git rebase --continue + ) && test M = $(git cat-file commit HEAD^ | sed -ne \$p) && test L = $(git cat-file commit HEAD | sed -ne \$p) '
@@ -1106,8 +1201,10 @@ test_expect_success 'rebase -i respects core.commentchar' ' sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" && mv "$1.tmp" "$1" EOF - test_set_editor "$(pwd)/remove-all-but-first.sh" && - git rebase -i B && + ( + test_set_editor "$(pwd)/remove-all-but-first.sh" && + git rebase -i B + ) && test B = $(git cat-file commit HEAD^ | sed -ne \$p) '
@@ -1116,9 +1213,11 @@ test_expect_success 'rebase -i respects core.commentchar=auto' ' write_script copy-edit-script.sh <<-\EOF && cp "$1" edit-script EOF - test_set_editor "$(pwd)/copy-edit-script.sh" && test_when_finished "git rebase --abort || :" && - git rebase -i HEAD^ && + ( + test_set_editor "$(pwd)/copy-edit-script.sh" && + git rebase -i HEAD^ + ) && test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)" '
@@ -1153,8 +1252,11 @@ test_expect_success 'interrupted rebase -i with --strategy and -X' ' echo five >conflict && echo Z >file1 && git commit -a -m "one file conflict" && - set_fake_editor && - FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch && + ( + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive \ + -Xours conflict-branch + ) && git rebase --continue && test $(git show conflict-branch:conflict) = $(cat conflict) && test $(cat file1) = Z
@@ -1195,8 +1297,10 @@ test_expect_success 'short SHA-1 collide' ' test_expect_success 'respect core.abbrev' ' git config core.abbrev 12 && - set_cat_todo_editor && - test_must_fail git rebase -i HEAD~4 >todo-list && + ( + set_cat_todo_editor && + test_must_fail git rebase -i HEAD~4 >todo-list + ) && test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list) '
@@ -1204,16 +1308,20 @@ test_expect_success 'todo count' ' write_script dump-raw.sh <<-\EOF && cat "$1" EOF - test_set_editor "$(pwd)/dump-raw.sh" && - git rebase -i HEAD~4 >actual && + ( + test_set_editor "$(pwd)/dump-raw.sh" && + git rebase -i HEAD~4 >actual + ) && test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual ' test_expect_success 'rebase -i commits that overwrite untracked files (pick)' ' git checkout --force branch2 && git clean -f && - set_fake_editor && - FAKE_LINES="edit 1 2" git rebase -i A && + ( + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i A + ) && test_cmp_rev HEAD F && test_path_is_missing file6 && >file6 &&
@@ -1228,8 +1336,10 @@ test_expect_success 'rebase -i commits that overwrite untracked files (squash)' git checkout --force branch2 && git clean -f && git tag original-branch2 && - set_fake_editor && - FAKE_LINES="edit 1 squash 2" git rebase -i A && + ( + set_fake_editor && + FAKE_LINES="edit 1 squash 2" git rebase -i A + ) && test_cmp_rev HEAD F && test_path_is_missing file6 && >file6 &&
@@ -1244,8 +1354,10 @@ test_expect_success 'rebase -i commits that overwrite untracked files (squash)' test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' ' git checkout --force branch2 && git clean -f && - set_fake_editor && - FAKE_LINES="edit 1 2" git rebase -i --no-ff A && + ( + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i --no-ff A + ) && test $(git cat-file commit HEAD | sed -ne \$p) = F && test_path_is_missing file6 && >file6 &&
@@ -1268,8 +1380,10 @@ test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' ' git tag seq-onto && git reset --hard HEAD~2 && git cherry-pick seq-onto && - set_fake_editor && - test_must_fail env FAKE_LINES= git rebase -i seq-onto && + ( + set_fake_editor && + test_must_fail env FAKE_LINES= git rebase -i seq-onto + ) && test -d .git/rebase-merge && git rebase --continue && git diff --exit-code seq-onto &&
@@ -1288,8 +1402,10 @@ rebase_setup_and_clean () { test_expect_success 'drop' ' rebase_setup_and_clean drop-test && - set_fake_editor && - FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root && + ( + set_fake_editor && + FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root + ) && test E = $(git cat-file commit HEAD | sed -ne \$p) && test C = $(git cat-file commit HEAD^ | sed -ne \$p) && test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
@@ -1298,9 +1414,10 @@ test_expect_success 'drop' ' test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' ' test_config rebase.missingCommitsCheck ignore && rebase_setup_and_clean missing-commit && - set_fake_editor && - FAKE_LINES="1 2 3 4" \ - git rebase -i --root 2>actual && + ( + set_fake_editor && + FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual + ) && test D = $(git cat-file commit HEAD | sed -ne \$p) && test_i18ngrep \ "Successfully rebased and updated refs/heads/missing-commit" \
@@ -1316,9 +1433,10 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' ' EOF test_config rebase.missingCommitsCheck warn && rebase_setup_and_clean missing-commit && - set_fake_editor && - FAKE_LINES="1 2 3 4" \ - git rebase -i --root 2>actual.2 && + ( + set_fake_editor && + FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2 + ) && head -n4 actual.2 >actual && test_i18ncmp expect actual && test D = $(git cat-file commit HEAD | sed -ne \$p)
@@ -1340,14 +1458,15 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' ' EOF test_config rebase.missingCommitsCheck error && rebase_setup_and_clean missing-commit && - set_fake_editor && - test_must_fail env FAKE_LINES="1 2 4" \ - git rebase -i --root 2>actual && - test_i18ncmp expect actual && - cp .git/rebase-merge/git-rebase-todo.backup \ - .git/rebase-merge/git-rebase-todo && - FAKE_LINES="1 2 drop 3 4 drop 5" \ - git rebase --edit-todo && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 2 4" \ + git rebase -i --root 2>actual && + test_i18ncmp expect actual && + cp .git/rebase-merge/git-rebase-todo.backup \ + .git/rebase-merge/git-rebase-todo && + FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo + ) && git rebase --continue && test D = $(git cat-file commit HEAD | sed -ne \$p) && test B = $(git cat-file commit HEAD^ | sed -ne \$p)
@@ -1368,21 +1487,27 @@ test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and e x git show HEAD EOF git checkout abbrevcmd && - set_cat_todo_editor && test_config rebase.abbreviateCommands true && - test_must_fail git rebase -i --exec "git show HEAD" \ - --autosquash master >actual && + ( + set_cat_todo_editor && + test_must_fail git rebase -i --exec "git show HEAD" \ + --autosquash master >actual + ) && test_cmp expected actual ' test_expect_success 'static check of bad command' ' rebase_setup_and_clean bad-cmd && - set_fake_editor && - test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \ + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \ git rebase -i --root 2>actual && - test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" actual && - test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual && - FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo && + test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" \ + actual && + test_i18ngrep "You can fix this with .git rebase --edit-todo.." \ + actual && + FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo + ) && git rebase --continue && test E = $(git cat-file commit HEAD | sed -ne \$p) && test C = $(git cat-file commit HEAD^ | sed -ne \$p)
@@ -1398,19 +1523,24 @@ test_expect_success 'tabs and spaces are accepted in the todolist' ' ) >"$1.new" mv "$1.new" "$1" EOF - test_set_editor "$(pwd)/add-indent.sh" && - git rebase -i HEAD^^^ && + ( + test_set_editor "$(pwd)/add-indent.sh" && + git rebase -i HEAD^^^ + ) && test E = $(git cat-file commit HEAD | sed -ne \$p) ' test_expect_success 'static check of bad SHA-1' ' rebase_setup_and_clean bad-sha && - set_fake_editor && - test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \ - git rebase -i --root 2>actual && - test_i18ngrep "edit XXXXXXX False commit" actual && - test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual && - FAKE_LINES="1 2 4 5 6" git rebase --edit-todo && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \ + git rebase -i --root 2>actual && + test_i18ngrep "edit XXXXXXX False commit" actual && + test_i18ngrep "You can fix this with .git rebase --edit-todo.." \ + actual && + FAKE_LINES="1 2 4 5 6" git rebase --edit-todo + ) && git rebase --continue && test E = $(git cat-file commit HEAD | sed -ne \$p) '
@@ -1430,37 +1560,45 @@ test_expect_success 'editor saves as CR/LF' ' 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 ' test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' ' test_when_finished "test_might_fail git rebase --abort" && test_config commit.gpgsign true && - 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 ' test_expect_success 'valid author header after --root swap' ' rebase_setup_and_clean author-header no-conflict-branch && - set_fake_editor && git commit --amend --author="Au ${SQ}thor <[email protected]>" --no-edit && git cat-file commit HEAD | grep ^author >expected && - FAKE_LINES="5 1" git rebase -i --root && + ( + set_fake_editor && + FAKE_LINES="5 1" git rebase -i --root + ) && git cat-file commit HEAD^ | grep ^author >actual && test_cmp expected actual ' test_expect_success 'valid author header when author contains single quote' ' rebase_setup_and_clean author-header no-conflict-branch && - set_fake_editor && git commit --amend --author="Au ${SQ}thor <[email protected]>" --no-edit && git cat-file commit HEAD | grep ^author >expected && - FAKE_LINES="2" git rebase -i HEAD~2 && + ( + set_fake_editor && + FAKE_LINES="2" git rebase -i HEAD~2 + ) && git cat-file commit HEAD | grep ^author >actual && test_cmp expected actual '
Signature · 1 line
gitgitgadget
PATCH v2 3/6 t3404: remove uneeded calls to set_fake_editor
In reply to Phillip Wood via GitGitGadgetFrom: Phillip Wood <[email protected]>
Some tests were calling set_fake_editor to ensure they had a sane no-op editor set. Now that all the editor setting is done in subshells these tests can rely on EDITOR=: and so do not need to call set_fake_editor.
Also add a test at the end to detect any future additions messing with the exported value of $EDITOR.
--- t/lib-rebase.sh | 28 ++++++++++++++++++++++++++++ t/t3404-rebase-interactive.sh | 25 +++++-------------------- 2 files changed, 33 insertions(+), 20 deletions(-)
t/lib-rebase.sh +28 -0
@@ -118,3 +118,31 @@ make_empty () { git commit --allow-empty -m "$1" && git tag "$1" } + +# Call this (inside test_expect_success) at the end of a test file to +# check that no tests have changed editor related environment +# variables or config settings +test_editor_unchanged () { + # We're only interested in exported variables hence 'sh -c' + sh -c 'cat >actual <<-EOF + EDITOR=$EDITOR + FAKE_COMMIT_AMEND=$FAKE_COMMIT_AMEND + FAKE_COMMIT_MESSAGE=$FAKE_COMMIT_MESSAGE + FAKE_LINES=$FAKE_LINES + GIT_EDITOR=$GIT_EDITOR + GIT_SEQUENCE_EDITOR=$GIT_SEQUENCE_EDITOR + core.editor=$(git config core.editor) + sequence.editor=$(git config sequence.editor) + EOF' + cat >expect <<-\EOF + EDITOR=: + FAKE_COMMIT_AMEND= + FAKE_COMMIT_MESSAGE= + FAKE_LINES= + GIT_EDITOR= + GIT_SEQUENCE_EDITOR= + core.editor= + sequence.editor= + EOF + test_cmp expect actual +}
t/t3404-rebase-interactive.sh +5 -20
@@ -189,7 +189,6 @@ test_expect_success 'implicit interactive rebase does not invoke sequence editor test_expect_success 'no changes are a nop' ' git checkout branch2 && - set_fake_editor && git rebase -i F && test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" && test $(git rev-parse I) = $(git rev-parse HEAD)
@@ -199,7 +198,6 @@ test_expect_success 'test the [branch] option' ' git checkout -b dead-end && git rm file6 && git commit -m "stop here" && - set_fake_editor && git rebase -i F branch2 && test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" && test $(git rev-parse I) = $(git rev-parse branch2) &&
@@ -208,7 +206,6 @@ test_expect_success 'test the [branch] option' ' test_expect_success 'test --onto <branch>' ' git checkout -b test-onto branch2 && - set_fake_editor && git rebase -i --onto branch1 F && test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" && test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
@@ -218,7 +215,6 @@ test_expect_success 'test --onto <branch>' ' test_expect_success 'rebase on top of a non-conflicting commit' ' git checkout branch1 && git tag original-branch1 && - set_fake_editor && git rebase -i branch2 && test file6 = $(git diff --name-only original-branch1) && test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
@@ -264,7 +260,6 @@ test_expect_success 'stop on conflicting pick' ' >>>>>>> 5d18e54... 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 &&
@@ -293,7 +288,6 @@ test_expect_success 'abort' ' test_expect_success 'abort with error when new base cannot be checked out' ' git rm --cached file1 && git commit -m "remove file in base" && - set_fake_editor && test_must_fail git rebase -i master > output 2>&1 && test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \ output &&
@@ -308,7 +302,6 @@ test_expect_success 'retain authorship' ' test_tick && GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" && git tag twerp && - set_fake_editor && git rebase -i --onto master HEAD^ && git show HEAD | grep "^Author: Twerp Snog" '
@@ -326,7 +319,6 @@ test_expect_success 'retain authorship w/ conflicts' ' test_commit b conflict b conflict-b && GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME && - set_fake_editor && test_must_fail git rebase -i conflict-a && echo resolved >conflict && git add conflict &&
@@ -357,7 +349,6 @@ test_expect_success 'retain authorship when squashing' ' test_expect_success REBASE_P '-p handles "no changes" gracefully' ' HEAD=$(git rev-parse HEAD) && - set_fake_editor && git rebase -i -p HEAD^ && git update-index --refresh && git diff-files --quiet &&
@@ -404,7 +395,6 @@ test_expect_success REBASE_P 'preserve merges with -p' ' git commit -m M file1 && git checkout -b to-be-rebased && test_tick && - set_fake_editor && git rebase -i -p --onto branch1 master && git update-index --refresh && git diff-files --quiet &&
@@ -450,7 +440,6 @@ test_expect_success '--continue tries to commit' ' test_expect_success 'verbose flag is heeded, even after --continue' ' git reset --hard master@{1} && test_tick && - set_fake_editor && test_must_fail git rebase -v -i --onto new-branch1 HEAD^ && echo resolved > file1 && git add file1 &&
@@ -750,7 +739,6 @@ test_expect_success 'do "noop" when there is nothing to cherry-pick' ' GIT_EDITOR=: git commit --amend \ --author="Somebody else <[email protected]>" && test $(git rev-parse branch3) != $(git rev-parse branch4) && - set_fake_editor && git rebase -i branch3 && test $(git rev-parse branch3) = $(git rev-parse branch4)
@@ -775,7 +763,6 @@ test_expect_success 'submodule rebase setup' ' git commit -a -m "submodule second" ) && test_tick && - set_fake_editor && git commit -a -m "Three changes submodule" '
@@ -800,7 +787,6 @@ test_expect_success 'submodule conflict setup' ' ' test_expect_success 'rebase -i continue with only submodule staged' ' - set_fake_editor && test_must_fail git rebase -i submodule-base && git add sub && git rebase --continue &&
@@ -810,7 +796,6 @@ test_expect_success 'rebase -i continue with only submodule staged' ' test_expect_success 'rebase -i continue with unstaged submodule' ' git checkout submodule-topic && git reset --hard && - set_fake_editor && test_must_fail git rebase -i submodule-base && git reset && git rebase --continue &&
@@ -823,7 +808,6 @@ test_expect_success 'avoid unnecessary reset' ' test-tool chmtime =123456789 file3 && git update-index --refresh && HEAD=$(git rev-parse HEAD) && - set_fake_editor && git rebase -i HEAD~4 && test $HEAD = $(git rev-parse HEAD) && MTIME=$(test-tool chmtime --get file3) &&
@@ -858,7 +842,6 @@ test_expect_success 'rebase -i can copy notes' ' test_commit n2 && test_commit n3 && git notes add -m"a note" n3 && - set_fake_editor && git rebase -i --onto n1 n2 && test "a note" = "$(git notes show HEAD)" '
@@ -896,7 +879,6 @@ test_tick # Ensure that the rebased commits get a different timestamp. test_expect_success 'always cherry-pick with --no-ff' ' git checkout no-ff-branch && git tag original-no-ff-branch && - set_fake_editor && git rebase -i --no-ff A && for p in 0 1 2 do
@@ -1044,7 +1026,6 @@ test_expect_success 'rebase --exec works without -i ' ' test_expect_success 'rebase -i --exec without <CMD>' ' git reset --hard execute && - set_fake_editor && test_must_fail git rebase -i --exec 2>actual && test_i18ngrep "requires a value" actual && git checkout master
@@ -1180,7 +1161,6 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' ' test_expect_success 'rebase -i produces readable reflog' ' git reset --hard && git branch -f branch-reflog-test H && - set_fake_editor && git rebase -i --onto I F branch-reflog-test && cat >expect <<-\EOF && rebase -i (finish): returning to refs/heads/branch-reflog-test
@@ -1603,4 +1583,9 @@ test_expect_success 'valid author header when author contains single quote' ' test_cmp expected actual ' +# This must be the last test in this file +test_expect_success '$EDITOR and friends are unchanged' ' + test_editor_unchanged +' + test_done
Signature · 1 line
gitgitgadget
PATCH v2 4/6 sequencer.h fix placement of #endif
In reply to Phillip Wood via GitGitGadgetFrom: Phillip Wood <[email protected]>
Commit 65850686cf ("rebase -i: rewrite write_basic_state() in C", 2018-08-28) accidentially added new function declarations after the #endif at the end of the include guard.
--- sequencer.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sequencer.h +1 -2
@@ -195,11 +195,10 @@ void print_commit_summary(struct repository *repo,int read_author_script (const char *path,char **name,char **email,char **date,int allow_missing); -#endif -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);int sequencer_get_last_command (struct repository * r,enum replay_action *action); +#endif /* SEQUENCER_H */
Signature · 1 line
gitgitgadget
PATCH v2 5/6 move run_commit_hook() to libgit and use it there
In reply to Phillip Wood via GitGitGadgetFrom: Phillip Wood <[email protected]>
This function was declared in commit.h but was implemented in builtin/commit.c so was not part of libgit. Move it to libgit so we can use it in the sequencer. This simplifies the implementation of run_prepare_commit_msg_hook() and will be used in the next commit.
--- builtin/commit.c | 22 ---------------------- commit.c | 24 ++++++++++++++++++++++++ sequencer.c | 23 ++++++++++------------- 3 files changed, 34 insertions(+), 35 deletions(-)
builtin/commit.c +0 -22
@@ -1443,28 +1443,6 @@ static int git_commit_config(const char *k, const char *v, void *cb)return git_status_config (k, v, s); } -int run_commit_hook (int editor_is_used,const char *index_file,const char *name, ...) -{ -struct argv_array hook_env =ARGV_ARRAY_INIT ; -va_list args; -int ret; - -argv_array_pushf (&hook_env,"GIT_INDEX_FILE=%s" , index_file); - -/* -* Let the hook know that no editor will be launched. -*/ -if (!editor_is_used) -argv_array_push (&hook_env,"GIT_EDITOR=:" ); - -va_start (args, name); - ret =run_hook_ve (hook_env.argv,name, args); -va_end (args); -argv_array_clear (&hook_env); - -return ret; -} -int cmd_commit (int argc,const char **argv,const char *prefix) {const char *argv_gc_auto[] = {"gc" ,"--auto" ,NULL };
commit.c +24 -0
@@ -19,6 +19,7 @@#include "advice.h" #include "refs.h" #include "commit-reach.h" +#include "run-command.h" static struct commit_extra_header *read_commit_extra_header_lines (const char *buf,size_t len,const char **);
@@ -1581,3 +1582,26 @@ size_t ignore_non_trailer(const char *buf, size_t len) }return boc ? len - boc : len - cutoff; } + +int run_commit_hook (int editor_is_used,const char *index_file, +const char *name, ...) +{ +struct argv_array hook_env =ARGV_ARRAY_INIT ; +va_list args; +int ret; + +argv_array_pushf (&hook_env,"GIT_INDEX_FILE=%s" , index_file); + +/* +* Let the hook know that no editor will be launched. +*/ +if (!editor_is_used) +argv_array_push (&hook_env,"GIT_EDITOR=:" ); + +va_start (args, name); + ret =run_hook_ve (hook_env.argv,name, args); +va_end (args); +argv_array_clear (&hook_env); + +return ret; +}
sequencer.c +10 -13
@@ -1127,25 +1127,22 @@ static int run_prepare_commit_msg_hook(struct repository *r,struct strbuf *msg, const char *commit) { - struct argv_array hook_env = ARGV_ARRAY_INIT; -int ret; -const char *name; + int ret = 0; +const char *name, *arg1 =NULL , *arg2 =NULL ; name =git_path_commit_editmsg ();if (write_message (msg->buf, msg->len, name,0 ))return -1 ; -argv_array_pushf (&hook_env,"GIT_INDEX_FILE=%s" , r->index_file); -argv_array_push (&hook_env,"GIT_EDITOR=:" ); -if (commit) - ret =run_hook_le (hook_env.argv,"prepare-commit-msg" , name, -"commit" , commit,NULL ); -else - ret =run_hook_le (hook_env.argv,"prepare-commit-msg" , name, -"message" ,NULL ); -if (ret) +if (commit) { + arg1 ="commit" ; + arg2 = commit; + }else { + arg1 ="message" ; + } +if (run_commit_hook (0 , r->index_file,"prepare-commit-msg" , name, + arg1, arg2,NULL )) ret =error (_ ("'prepare-commit-msg' hook failed" )); -argv_array_clear (&hook_env);return ret; }
Signature · 1 line
gitgitgadget
PATCH v2 6/6 sequencer: run post-commit hook
In reply to Phillip Wood via GitGitGadgetFrom: Phillip Wood <[email protected]>
Prior to commit 356ee4659b ("sequencer: try to commit without forking 'git commit'", 2017-11-24) the sequencer would always run the post-commit hook after each pick or revert as it forked git commit to create the commit. The conversion to committing without forking git commit omitted to call the post-commit hook after creating the commit.
--- sequencer.c | 1 + t/t3404-rebase-interactive.sh | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+)
sequencer.c +1 -0
@@ -1401,6 +1401,7 @@ static int try_to_commit(struct repository *r, goto out; } +run_commit_hook (0 , r->index_file,"post-commit" ,NULL );if (flags &AMEND_MSG )commit_post_rewrite (r, current_head, oid);
t/t3404-rebase-interactive.sh +19 -0
@@ -1583,6 +1583,25 @@ test_expect_success 'valid author header when author contains single quote' ' test_cmp expected actual ' +test_expect_success 'post-commit hook is called' ' + test_when_finished "rm -f .git/hooks/post-commit" && + >actual && + mkdir -p .git/hooks && + write_script .git/hooks/post-commit <<-\EOS && + git rev-parse HEAD >>actual + EOS + ( + set_fake_editor && + FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E && + echo x>file3 && + git add file3 && + FAKE_COMMIT_MESSAGE=edited git rebase --continue + ) && + git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \ + >expect && + test_cmp expect actual +' + # This must be the last test in this file test_expect_success '$EDITOR and friends are unchanged' ' test_editor_unchanged
Signature · 1 line
gitgitgadget
Hi Phillip,
Quoted 18 lines · Phillip Wood via GitGitGadget
When I converted the sequencer to avoid forking git commit i forgot about the post-commit hook. These patches are based on pw/rebase-i-show-HEAD-to-reword, otherwise the new test fails as that branch changes the number of commits we make.
Thanks to Dscho & Junio for their comments on V1. I've made the following changes:
Patches 1-3 These are new patches in response to Dscho's request to set $EDITOR in a subshell. There were ~80 other tests that weren't doing that and they are fixed in these patches. Patch 2 contains the main action, unfortunately due to a combination of having to remove the trailing ' &&' from the last line moved into the subshell and re-wrapping some lines due to the increased indentation --color-moved and --color-moved-ws are of limited use when viewing this patch.
Patch 4 (was 1) Unchanged
Quoted 8 lines
Patch 5 (was 2) I've moved the function definition to
commit.crather thansequencer.cas suggested. I've also removed an unused structargv_arrayfromrun_prepare_commit_msg_hook()(There wasn't a compiler warning as it was still callingargv_array_clear()at the end of the function) and reworded the commit message.Patch 6 (was 3) I've tided up the test and removed the wrapper function for running the post-commit hook as suggested.
I had a look over the patches, too, and all looks good to me.
Thank you so much!
Dscho
Quoted 219 lines
Phillip Wood (6):
t3404: remove unnecessary subshell
t3404: set $EDITOR in subshell
t3404: remove uneeded calls toset_fake_editorsequencer.hfix placement of #endif
moverun_commit_hook()to libgit and use it there
sequencer: run post-commit hookbuiltin/commit.c | 22 -- commit.c | 24 ++ sequencer.c | 24 +- sequencer.h | 3 +- t/lib-rebase.sh | 28 ++ t/t3404-rebase-interactive.sh | 596 +++++++++++++++++++++------------- 6 files changed, 432 insertions(+), 265 deletions(-)base-commit:
b0a3186140dbc7bd64cbc6ef733386a0f1eb6a4d
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-388%2Fphillipwood%2Fwip%2Frebase-commit-hooks-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-388/phillipwood/wip/rebase-commit-hooks-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/388Range-diff vs v1:
-: ---------- > 1: b9689e85e5 t3404: remove unnecessary subshell -: ---------- > 2: 96432cd0f0 t3404: set $EDITOR in subshell -: ---------- > 3: 09857dee78 t3404: remove uneeded calls to set_fake_editor 1: 7305f8d8e8 = 4: 0eac3ede02 sequencer.h fix placement of #endif 2: 420ecf442c ! 5: f394a0e163 sequencer: use run_commit_hook()@@ -1,9 +1,11 @@
Author: Phillip Wood <[email protected]>- sequencer: use
run_commit_hook()
+ moverun_commit_hook()to libgit and use it there- This simplifies the implementation of
run_prepare_commit_msg_hook()and
- will be used in the next commit.
+ This function was declared incommit.hbut was implemented in
+builtin/commit.cso was not part of libgit. Move it to libgit so we can
+ use it in the sequencer. This simplifies the implementation of
+run_prepare_commit_msg_hook()and will be used in the next commit.Signed-off-by Phillip Wood <[email protected]>@@ -40,25 +42,22 @@
{
const char *argv_gc_auto[] = {"gc", "--auto", NULL};- diff --git
a/commit.hb/commit.h
- ---a/commit.h
- +++b/commit.h
+ diff --gita/commit.cb/commit.c
+ ---a/commit.c
+ +++b/commit.c
@@
- intcompare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
- intcompare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
+ #include "advice.h"
+ #include "refs.h"
+ #include "commit-reach.h"
++#include "run-command.h"
+
+ static structcommit_extra_header*read_commit_extra_header_lines(const char *buf,size_tlen, const char **);--LAST_ARG_MUST_BE_NULL
--intrun_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); --
- #endif /*COMMIT_H*/
-
- diff --gita/sequencer.cb/sequencer.c
- ---a/sequencer.c
- +++b/sequencer.c
@@
-run_rewrite_hook(&old_head->object.oid, new_head);
+ }
+ return boc ? len - boc : len - cutoff;
}
-
++
+int run_commit_hook(inteditor_is_used, const char*index_file,
+ const char *name, ...)
+{
@@ -81,12 +80,15 @@
+
+ return ret;
+}
-+
- static int run_prepare_commit_msg_hook(struct repository *r,
+
+ diff --gita/sequencer.cb/sequencer.c
+ ---a/sequencer.c
+ +++b/sequencer.c
+@@
struct strbuf *msg,
const char *commit)
{
- structargv_arrayhook_env=ARGV_ARRAY_INIT;
+- structargv_arrayhook_env=ARGV_ARRAY_INIT;
- int ret;
- const char *name;
+ int ret = 0;
@@ -114,18 +116,7 @@
+ if (run_commit_hook(0,r->index_file, "prepare-commit-msg", name,
+ arg1, arg2, NULL))
ret =error(_("'prepare-commit-msg' hook failed"));
-+
-argv_array_clear(&hook_env);
+-argv_array_clear(&hook_env);return ret;
-
- diff --gita/sequencer.hb/sequencer.h
- ---a/sequencer.h
- +++b/sequencer.h
-@@
- voidsequencer_post_commit_cleanup(struct repository *r);
- int sequencer_get_last_command(struct repository* r,
- enumreplay_action*action);
-+LAST_ARG_MUST_BE_NULL
-+intrun_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
- #endif /*SEQUENCER_H*/
+ }
3:acaa086a48! 6:67a711754esequencer: run post-commit hook@@ -10,52 +10,18 @@ Signed-off-by: Phillip Wood <[email protected]> - diff --git a/builtin/commit.c b/builtin/commit.c - --- a/builtin/commit.c - +++ b/builtin/commit.c -@@ - - repo_rerere(the_repository, 0); - run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); -- run_commit_hook(use_editor, get_index_file(), "post-commit", NULL); -+ run_post_commit_hook(use_editor, get_index_file()); - if (amend && !no_post_rewrite) { - commit_post_rewrite(the_repository, current_head, &oid); - } - diff --git a/sequencer.c b/sequencer.c --- a/sequencer.c +++ b/sequencer.c -@@ - return ret; - } - -+void run_post_commit_hook(int editor_is_used, const char *index_file) { -+ run_commit_hook(editor_is_used, index_file, "post-commit", NULL); -+} -+ - static const char implicit_ident_advice_noconfig[] = - N_("Your name and email address were configured automatically based\n" - "on your username and hostname. Please check that they are accurate.\n" @@ goto out; } -+ run_post_commit_hook(0, r->index_file); ++ run_commit_hook(0, r->index_file, "post-commit", NULL); if (flags & AMEND_MSG) commit_post_rewrite(r, current_head, oid); - diff --git a/sequencer.h b/sequencer.h - --- a/sequencer.h - +++ b/sequencer.h -@@ - enum replay_action *action); - LAST_ARG_MUST_BE_NULL - int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...); -+void run_post_commit_hook(int editor_is_used, const char *index_file); - #endif /* SEQUENCER_H */ - diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -64,20 +30,24 @@ ' +test_expect_success 'post-commit hook is called' ' -+ test_when_finished "rm -f .git/hooks/post-commit commits" && ++ test_when_finished "rm -f .git/hooks/post-commit" && ++ >actual && + mkdir -p .git/hooks && + write_script .git/hooks/post-commit <<-\EOS && -+ git rev-parse HEAD >>commits ++ git rev-parse HEAD >>actual + EOS -+ set_fake_editor && -+ FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E && -+ echo x>file3 && -+ git add file3 && -+ FAKE_COMMIT_MESSAGE=edited git rebase --continue && -+ # rev-list does not support -g --reverse -+ git rev-list --no-walk=unsorted HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} \ -+ HEAD@{1} HEAD >expected && -+ test_cmp expected commits ++ ( ++ set_fake_editor && ++ FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E && ++ echo x>file3 && ++ git add file3 && ++ FAKE_COMMIT_MESSAGE=edited git rebase --continue ++ ) && ++ git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \ ++ >expect && ++ test_cmp expect actual +' + - test_done + # This must be the last test in this file + test_expect_success '$EDITOR and friends are unchanged' ' + test_editor_unchanged--
gitgitgadget
Quoted 11 lines · Johannes Schindelin
Hi Phillip,
Quoted 5 lines · Phillip Wood via GitGitGadget
When I converted the sequencer to avoid forking git commit i forgot about the post-commit hook. These patches are based on pw/rebase-i-show-HEAD-to-reword, otherwise the new test fails as that branch changes the number of commits we make.
...I had a look over the patches, too, and all looks good to me.
Me three; thanks, both.