{"thread":{"id":"20456","subject":"[PATCH 3/4] sequencer: let \"git sequencer--helper\" callers set \"allow_dirty\"","startedAt":"2009-08-07T20:40:52Z","lastAt":"2009-08-07T20:40:52Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"119929","messageId":"20090807204054.6280.98837.chriscool@tuxfamily.org","threadId":"20456","inReplyTo":null,"subject":"[PATCH 3/4] sequencer: let \"git sequencer--helper\" callers set \"allow_dirty\"","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-08-07T20:40:52Z","receivedAt":"2009-08-07T20:40:52Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"This flag can be set when using --reset-hard or --fast-forward, and\nin this case changes in the work tree will be kept.\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n builtin-sequencer--helper.c |   11 ++++++++---\n 1 files changed, 8 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin-sequencer--helper.c b/builtin-sequencer--helper.c\nindex bd72f65..71a7fef 100644\n--- a/builtin-sequencer--helper.c\n+++ b/builtin-sequencer--helper.c\n@@ -18,8 +18,10 @@ static unsigned char head_sha1[20];\n \n static const char * const git_sequencer_helper_usage[] = {\n \t\"git sequencer--helper --make-patch <commit>\",\n-\t\"git sequencer--helper --reset-hard <commit> <reflog-msg> <verbosity>\",\n-\t\"git sequencer--helper --fast-forward <commit> <reflog-msg> <verbosity>\",\n+\t\"git sequencer--helper --reset-hard <commit> <reflog-msg> \"\n+\t\t\"<verbosity> [<allow-dirty>]\",\n+\t\"git sequencer--helper --fast-forward <commit> <reflog-msg> \"\n+\t\t\"<verbosity> [<allow-dirty>]\",\n \tNULL\n };\n \n@@ -247,7 +249,7 @@ int cmd_sequencer__helper(int argc, const char **argv, const char *prefix)\n \t\tunsigned char sha1[20];\n \t\tchar *commit = ff_commit ? ff_commit : reset_commit;\n \n-\t\tif (argc != 2)\n+\t\tif (argc != 2 && argc != 3)\n \t\t\tusage_with_options(git_sequencer_helper_usage,\n \t\t\t\t\t   options);\n \n@@ -263,6 +265,9 @@ int cmd_sequencer__helper(int argc, const char **argv, const char *prefix)\n \t\t\treturn 1;\n \t\t}\n \n+\t\tif (argc == 3 && *argv[2] && strcmp(argv[2], \"0\"))\n+\t\t\tallow_dirty = 1;\n+\n \t\tif (ff_commit)\n \t\t\treturn do_fast_forward(sha1);\n \t\telse\n-- \n1.6.4.209.g16b77\n"}]}