Since d3f4628e (revert: Remove sequencer state when no commits are
pending, 2011-07-06), the sequencer removes the sequencer state before
the final commit is actually completed. This design is inherently
flawed, as it will not allow the user to abort the sequencer operation
at that stage. Instead, write and expose a new function to count the
number of commits left in the instruction sheet; use this in
builtin/commit.c to remove the sequencer state when a commit has
successfully completed and there is only one instruction left in the
sheet.
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
builtin/commit.c | 7 ++++++-
sequencer.c | 26 +++++++++++++++-----------
sequencer.h | 1 +
t/t3510-cherry-pick-sequence.sh | 4 ++--
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index e1af9b1..4a5af9a 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -26,6 +26,7 @@
#include "unpack-trees.h"
#include "quote.h"
#include "submodule.h"
+#include "sequencer.h"
static const char * const builtin_commit_usage[] = {
"git commit [options] [--] <filepattern>...",
@@ -1521,7 +1522,11 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
unlink(git_path("MERGE_MODE"));
unlink(git_path("SQUASH_MSG"));
- if (commit_index_files())
+ /* Remove sequencer state if we just finished the last insn */
+ if (sequencer_count_todo() == 1)
+ remove_sequencer_state(1);
+
+ if (commit_index_files())
die (_("Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."));
diff --git a/sequencer.c b/sequencer.c
index e72618c..783b4a9 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -736,6 +736,20 @@ static void read_populate_todo(struct replay_insn_list **todo_list)
die(_("Unusable instruction sheet: %s"), todo_file);
}
+int sequencer_count_todo(void)
+{
+ struct replay_insn_list *todo_list = NULL;
+ struct replay_insn_list *cur;
+ int insn_count = 0;
+
+ if (!file_exists(git_path(SEQ_TODO_FILE)))
+ return 0;
+ read_populate_todo(&todo_list);
+ for (cur = todo_list; cur; cur = cur->next)
+ insn_count += 1;
+ return insn_count;
+}
+
static int populate_opts_cb(const char *key, const char *value, void *data)
{
struct replay_opts *opts = data;
@@ -901,18 +915,8 @@ static int pick_commits(struct replay_insn_list *todo_list,
for (cur = todo_list; cur; cur = cur->next) {
save_todo(cur);
res = do_pick_commit(cur->operand, cur->action, opts);
- if (res) {
- if (!cur->next && res > 0)
- /*
- * A conflict was encountered while
- * picking the last commit. The
- * sequencer state is useless now --
- * the user simply needs to resolve
- * the conflict and commit
- */
- remove_sequencer_state(0);
+ if (res)
return res;
- }
}
/*
diff --git a/sequencer.h b/sequencer.h
index ebf20cb..c64ba91 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -52,5 +52,6 @@ void remove_sequencer_state(int aggressive);
void sequencer_parse_args(int argc, const char **argv, struct replay_opts *opts);
int sequencer_pick_revisions(struct replay_opts *opts);
+int sequencer_count_todo(void);
#endif
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index bc7fb13..57e9e7c 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -82,13 +82,13 @@ test_expect_success '--reset cleans up sequencer state' '
test_path_is_missing .git/sequencer
'
-test_expect_success 'cherry-pick cleans up sequencer state when one commit is left' '
+test_expect_success 'final commit cleans up sequencer state' '
pristine_detach initial &&
test_must_fail git cherry-pick base..picked &&
- test_path_is_missing .git/sequencer &&
echo "resolved" >foo &&
git add foo &&
git commit &&
+ test_path_is_missing .git/sequencer &&
{
git rev-list HEAD |
git diff-tree --root --stdin |
--
1.7.6.351.gb35ac.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html