[PATCH v4 09/15] sequencer: let "git sequencer--helper" callers set "allow_dirty"
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Aug 28, 2009, 04:47 UTC
- Message-ID
- <20090828044746.4307.53606.chriscool@tuxfamily.org>
- In-Reply-To
- <20090828043913.4307.34708.chriscool@tuxfamily.org>
This flag can be set when using --reset-hard or --fast-forward, and in this case changes in the work tree will be kept.
This change is usefull to let people play with the "allow_dirty" feature.
Suggested-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin-sequencer--helper.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/builtin-sequencer--helper.c b/builtin-sequencer--helper.c index bd72f65..71a7fef 100644 --- a/builtin-sequencer--helper.c +++ b/builtin-sequencer--helper.c @@ -18,8 +18,10 @@ static unsigned char head_sha1[20]; static const char * const git_sequencer_helper_usage[] = { "git sequencer--helper --make-patch <commit>", - "git sequencer--helper --reset-hard <commit> <reflog-msg> <verbosity>", - "git sequencer--helper --fast-forward <commit> <reflog-msg> <verbosity>", + "git sequencer--helper --reset-hard <commit> <reflog-msg> " + "<verbosity> [<allow-dirty>]", + "git sequencer--helper --fast-forward <commit> <reflog-msg> " + "<verbosity> [<allow-dirty>]", NULL }; @@ -247,7 +249,7 @@ int cmd_sequencer__helper(int argc, const char **argv, const char *prefix) unsigned char sha1[20]; char *commit = ff_commit ? ff_commit : reset_commit; - if (argc != 2) + if (argc != 2 && argc != 3) usage_with_options(git_sequencer_helper_usage, options); @@ -263,6 +265,9 @@ int cmd_sequencer__helper(int argc, const char **argv, const char *prefix) return 1; } + if (argc == 3 && *argv[2] && strcmp(argv[2], "0")) + allow_dirty = 1; + if (ff_commit) return do_fast_forward(sha1); else
-- 1.6.4.271.ge010d