{"thread":{"id":"24858","subject":"[PATCH v6 0/3] rr/fmt-merge-msg replacement","startedAt":"2010-08-25T10:48:47Z","lastAt":"2010-08-26T16:58:44Z","messageCount":7,"participants":["Ramkumar Ramachandra","Junio C Hamano"],"isPatch":true,"patchVersion":6,"patchTotal":3},"messages":[{"id":"148963","messageId":"1282733330-32334-1-git-send-email-artagnon@gmail.com","threadId":"24858","inReplyTo":null,"subject":"[PATCH v6 0/3] rr/fmt-merge-msg replacement","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-08-25T10:48:47Z","receivedAt":"2010-08-25T10:48:47Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Hi Junio,\n\nThis is a replacement for rr/fmt-merge-msg. It corrects the problems\npointed out by Jonathan and adds one extra patch. Additionally, I've\nrebased it so there's no merge conflict when you merge it into `pu`\n(see: jn/merge-renormalize). 4/5 from v5 has been dropped.\n\nThanks.\n\nRamkumar Ramachandra (3):\n fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len\n merge: Make '--log' an integer option for number of shortlog entries\n merge: Make 'merge.log' an integer or boolean option\n\n Documentation/git-fmt-merge-msg.txt | 10 ++++--\n Documentation/merge-config.txt | 6 ++-\n Documentation/merge-options.txt | 6 ++--\n builtin.h | 7 ++--\n builtin/fmt-merge-msg.c | 56 +++++++++++++++++-----------------\n builtin/merge.c | 29 ++++++++++--------\n 6 files changed, 61 insertions(+), 53 deletions(-)\n\n-- \n1.7.2.2.409.gdbb11.dirty\n"},{"id":"148965","messageId":"1282733330-32334-2-git-send-email-artagnon@gmail.com","threadId":"24858","inReplyTo":"1282733330-32334-1-git-send-email-artagnon@gmail.com","subject":"[PATCH v6 1/3] fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-08-25T10:48:48Z","receivedAt":"2010-08-25T10:48:48Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Give \"shortlog_len\" parameter to the fmt_merge_msg(), remove its\n\"merge_summary\" parameter, and remove fmt_merge_msg_shortlog() function.\nIn the updated API, shortlog_len == 0 means no shortlog is given.\n\nThe parameter \"merge_title\" controls if the title of the merge commit is\nautogenerated (it reads something like \"Merge branch ...\"), and typically\nit is set to true when the caller does not give its own message.\n\nSigned-off-by: Ramkumar Ramachandra \nHelped-and-Reviewed-by: Jonathan Nieder \nSigned-off-by: Junio C Hamano \n---\n builtin.h | 7 ++++---\n builtin/fmt-merge-msg.c | 30 ++++++++++++++----------------\n builtin/merge.c | 14 ++++++--------\n 3 files changed, 24 insertions(+), 27 deletions(-)\n\ndiff --git a/builtin.h b/builtin.h\nindex 9c3d50b..009992e 100644\n--- a/builtin.h\n+++ b/builtin.h\n@@ -7,6 +7,8 @@\n #include \"commit.h\"\n #include \"notes.h\"\n \n+#define DEFAULT_MERGE_LOG_LEN 20\n+\n extern const char git_version_string[];\n extern const char git_usage_string[];\n extern const char git_more_info_string[];\n@@ -14,9 +16,8 @@ extern const char git_more_info_string[];\n extern void list_common_cmds_help(void);\n extern const char *help_unknown_cmd(const char *cmd);\n extern void prune_packed_objects(int);\n-extern int fmt_merge_msg(int merge_summary, struct strbuf *in,\n-\tstruct strbuf *out);\n-extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out);\n+extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,\n+\t\t\t int merge_title, int shortlog_len);\n extern int commit_notes(struct notes_tree *t, const char *msg);\n \n struct notes_rewrite_cfg {\ndiff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c\nindex e7e12ee..7f06b95 100644\n--- a/builtin/fmt-merge-msg.c\n+++ b/builtin/fmt-merge-msg.c\n@@ -255,9 +255,9 @@ static void do_fmt_merge_msg_title(struct strbuf *out,\n \t\tstrbuf_addf(out, \" into %s\\n\", current_branch);\n }\n \n-static int do_fmt_merge_msg(int merge_title, int merge_summary,\n-\tstruct strbuf *in, struct strbuf *out) {\n-\tint limit = 20, i = 0, pos = 0;\n+static int do_fmt_merge_msg(int merge_title, struct strbuf *in,\n+\tstruct strbuf *out, int shortlog_len) {\n+\tint i = 0, pos = 0;\n \tunsigned char head_sha1[20];\n \tconst char *current_branch;\n \n@@ -288,7 +288,7 @@ static int do_fmt_merge_msg(int merge_title, int merge_summary,\n \tif (merge_title)\n \t\tdo_fmt_merge_msg_title(out, current_branch);\n \n-\tif (merge_summary) {\n+\tif (shortlog_len) {\n \t\tstruct commit *head;\n \t\tstruct rev_info rev;\n \n@@ -303,17 +303,14 @@ static int do_fmt_merge_msg(int merge_title, int merge_summary,\n \n \t\tfor (i = 0; i < origins.nr; i++)\n \t\t\tshortlog(origins.items[i].string, origins.items[i].util,\n-\t\t\t\t\thead, &rev, limit, out);\n+\t\t\t\t\thead, &rev, shortlog_len, out);\n \t}\n \treturn 0;\n }\n \n-int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) {\n-\treturn do_fmt_merge_msg(1, merge_summary, in, out);\n-}\n-\n-int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out) {\n-\treturn do_fmt_merge_msg(0, 1, in, out);\n+int fmt_merge_msg(struct strbuf *in, struct strbuf *out,\n+\t\t int merge_title, int shortlog_len) {\n+\treturn do_fmt_merge_msg(merge_title, in, out, shortlog_len);\n }\n \n int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n@@ -355,12 +352,13 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n \n \tif (strbuf_read(&input, fileno(in), 0) < 0)\n \t\tdie_errno(\"could not read input file\");\n-\tif (message) {\n+\n+\tif (message)\n \t\tstrbuf_addstr(&output, message);\n-\t\tret = fmt_merge_msg_shortlog(&input, &output);\n-\t} else {\n-\t\tret = fmt_merge_msg(merge_summary, &input, &output);\n-\t}\n+\tret = fmt_merge_msg(&input, &output,\n+\t\t\t message ? 0 : 1,\n+\t\t\t merge_summary ? DEFAULT_MERGE_LOG_LEN : 0);\n+\n \tif (ret)\n \t\treturn ret;\n \twrite_in_full(STDOUT_FILENO, output.buf, output.len);\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 017e6d0..1f4d68d 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -1017,14 +1017,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)\n \t\tfor (i = 0; i < argc; i++)\n \t\t\tmerge_name(argv[i], &merge_names);\n \n-\t\tif (have_message && option_log)\n-\t\t\tfmt_merge_msg_shortlog(&merge_names, &merge_msg);\n-\t\telse if (!have_message)\n-\t\t\tfmt_merge_msg(option_log, &merge_names, &merge_msg);\n-\n-\n-\t\tif (!(have_message && !option_log) && merge_msg.len)\n-\t\t\tstrbuf_setlen(&merge_msg, merge_msg.len-1);\n+\t\tif (!have_message || option_log) {\n+\t\t\tfmt_merge_msg(&merge_names, &merge_msg, !have_message,\n+\t\t\t\t option_log ? DEFAULT_MERGE_LOG_LEN : 0);\n+\t\t\tif (merge_msg.len)\n+\t\t\t\tstrbuf_setlen(&merge_msg, merge_msg.len - 1);\n+\t\t}\n \t}\n \n \tif (head_invalid || !argc)\n-- \n1.7.2.2.409.gdbb11.dirty\n"},{"id":"148964","messageId":"1282733330-32334-3-git-send-email-artagnon@gmail.com","threadId":"24858","inReplyTo":"1282733330-32334-1-git-send-email-artagnon@gmail.com","subject":"[PATCH v6 2/3] merge: Make '--log' an integer option for number of shortlog entries","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-08-25T10:48:49Z","receivedAt":"2010-08-25T10:48:49Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Change the command-line '--log' option from a boolean option to an\ninteger option, and parse the optional integer provided on the\ncommand-line into the 'shortlog_len' variable. Also update the\ndocumentation accordingly.\n\nSigned-off-by: Ramkumar Ramachandra \nReported-by: Yaroslav Halchenko \nThanks-to: Jonathan Nieder \nThanks-to: Johannes Sixt \nSigned-off-by: Junio C Hamano \n---\n Documentation/git-fmt-merge-msg.txt | 10 ++++++----\n Documentation/merge-options.txt | 6 +++---\n builtin/fmt-merge-msg.c | 26 ++++++++++++++++----------\n builtin/merge.c | 13 +++++++------\n 4 files changed, 32 insertions(+), 23 deletions(-)\n\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex 302f56b..f04a9ff 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -9,8 +9,8 @@ git-fmt-merge-msg - Produce a merge commit message\n SYNOPSIS\n --------\n [verse]\n-'git fmt-merge-msg' [-m ] [--log | --no-log] <$GIT_DIR/FETCH_HEAD\n-'git fmt-merge-msg' [-m ] [--log | --no-log] -F \n+'git fmt-merge-msg' [-m ] [--log[=] | --no-log] <$GIT_DIR/FETCH_HEAD\n+'git fmt-merge-msg' [-m ] [--log[=] | --no-log] -F \n \n DESCRIPTION\n -----------\n@@ -24,10 +24,12 @@ automatically invoking 'git merge'.\n OPTIONS\n -------\n \n---log::\n+--log[=]::\n \tIn addition to branch names, populate the log message with\n \tone-line descriptions from the actual commits that are being\n-\tmerged.\n+\tmerged. At most commits from each merge parent will be\n+\tused (20 if is omitted). This overrides the `merge.log`\n+\tconfiguration variable.\n \n --no-log::\n \tDo not list one-line descriptions from the actual commits being\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex 722d704..e33e0f8 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -16,11 +16,11 @@ inspect and further tweak the merge result before committing.\n With --no-ff Generate a merge commit even if the merge\n resolved as a fast-forward.\n \n---log::\n+--log[=]::\n --no-log::\n \tIn addition to branch names, populate the log message with\n-\tone-line descriptions from the actual commits that are being\n-\tmerged.\n+\tone-line descriptions from at most actual commits that are being\n+\tmerged. See also linkgit:git-fmt-merge-msg[1].\n +\n With --no-log do not list one-line descriptions from the\n actual commits being merged.\ndiff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c\nindex 7f06b95..ec933df 100644\n--- a/builtin/fmt-merge-msg.c\n+++ b/builtin/fmt-merge-msg.c\n@@ -7,21 +7,24 @@\n #include \"string-list.h\"\n \n static const char * const fmt_merge_msg_usage[] = {\n-\t\"git fmt-merge-msg [-m ] [--log|--no-log] [--file ]\",\n+\t\"git fmt-merge-msg [-m ] [--log[=]|--no-log] [--file ]\",\n \tNULL\n };\n \n-static int merge_summary;\n+static int shortlog_len;\n \n static int fmt_merge_msg_config(const char *key, const char *value, void *cb)\n {\n \tstatic int found_merge_log = 0;\n \tif (!strcmp(\"merge.log\", key)) {\n \t\tfound_merge_log = 1;\n-\t\tmerge_summary = git_config_bool(key, value);\n+\t\tshortlog_len = git_config_bool(key, value) ? DEFAULT_MERGE_LOG_LEN : 0;\n+\t\treturn 0;\n+\t}\n+\tif (!found_merge_log && !strcmp(\"merge.summary\", key)) {\n+\t\tshortlog_len = git_config_bool(key, value) ? DEFAULT_MERGE_LOG_LEN : 0;\n+\t\treturn 0;\n \t}\n-\tif (!found_merge_log && !strcmp(\"merge.summary\", key))\n-\t\tmerge_summary = git_config_bool(key, value);\n \treturn 0;\n }\n \n@@ -318,10 +321,13 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n \tconst char *inpath = NULL;\n \tconst char *message = NULL;\n \tstruct option options[] = {\n-\t\tOPT_BOOLEAN(0, \"log\", &merge_summary, \"populate log with the shortlog\"),\n-\t\t{ OPTION_BOOLEAN, 0, \"summary\", &merge_summary, NULL,\n+\t\t{ OPTION_INTEGER, 0, \"log\", &shortlog_len, \"n\",\n+\t\t \"populate log with entries from shortlog\",\n+\t\t PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },\n+\t\t{ OPTION_INTEGER, 0, \"summary\", &shortlog_len, \"n\",\n \t\t \"alias for --log (deprecated)\",\n-\t\t PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },\n+\t\t PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, NULL,\n+\t\t DEFAULT_MERGE_LOG_LEN},\n \t\tOPT_STRING('m', \"message\", &message, \"text\",\n \t\t\t\"use as start of message\"),\n \t\tOPT_FILENAME('F', \"file\", &inpath, \"file to read from\"),\n@@ -337,7 +343,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n \t\t\t 0);\n \tif (argc > 0)\n \t\tusage_with_options(fmt_merge_msg_usage, options);\n-\tif (message && !merge_summary) {\n+\tif (message && !shortlog_len) {\n \t\tchar nl = '\\n';\n \t\twrite_in_full(STDOUT_FILENO, message, strlen(message));\n \t\twrite_in_full(STDOUT_FILENO, &nl, 1);\n@@ -357,7 +363,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)\n \t\tstrbuf_addstr(&output, message);\n \tret = fmt_merge_msg(&input, &output,\n \t\t\t message ? 0 : 1,\n-\t\t\t merge_summary ? DEFAULT_MERGE_LOG_LEN : 0);\n+\t\t\t shortlog_len);\n \n \tif (ret)\n \t\treturn ret;\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 1f4d68d..b067b84 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -42,7 +42,7 @@ static const char * const builtin_merge_usage[] = {\n \tNULL\n };\n \n-static int show_diffstat = 1, option_log, squash;\n+static int show_diffstat = 1, shortlog_len, squash;\n static int option_commit = 1, allow_fast_forward = 1;\n static int fast_forward_only;\n static int allow_trivial = 1, have_message;\n@@ -177,8 +177,9 @@ static struct option builtin_merge_options[] = {\n \tOPT_BOOLEAN(0, \"stat\", &show_diffstat,\n \t\t\"show a diffstat at the end of the merge\"),\n \tOPT_BOOLEAN(0, \"summary\", &show_diffstat, \"(synonym to --stat)\"),\n-\tOPT_BOOLEAN(0, \"log\", &option_log,\n-\t\t\"add list of one-line log to merge commit message\"),\n+\t{ OPTION_INTEGER, 0, \"log\", &shortlog_len, \"n\",\n+\t \"add (at most ) entries from shortlog to merge commit message\",\n+\t PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },\n \tOPT_BOOLEAN(0, \"squash\", &squash,\n \t\t\"create a single commit instead of doing a merge\"),\n \tOPT_BOOLEAN(0, \"commit\", &option_commit,\n@@ -507,7 +508,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)\n \telse if (!strcmp(k, \"pull.octopus\"))\n \t\treturn git_config_string(&pull_octopus, k, v);\n \telse if (!strcmp(k, \"merge.log\") || !strcmp(k, \"merge.summary\"))\n-\t\toption_log = git_config_bool(k, v);\n+\t\tshortlog_len = git_config_bool(k, v) ? DEFAULT_MERGE_LOG_LEN : 0;\n \telse if (!strcmp(k, \"merge.renormalize\"))\n \t\toption_renormalize = git_config_bool(k, v);\n \treturn git_diff_ui_config(k, v, cb);\n@@ -1017,9 +1018,9 @@ int cmd_merge(int argc, const char **argv, const char *prefix)\n \t\tfor (i = 0; i < argc; i++)\n \t\t\tmerge_name(argv[i], &merge_names);\n \n-\t\tif (!have_message || option_log) {\n+\t\tif (!have_message || shortlog_len) {\n \t\t\tfmt_merge_msg(&merge_names, &merge_msg, !have_message,\n-\t\t\t\t option_log ? DEFAULT_MERGE_LOG_LEN : 0);\n+\t\t\t\t shortlog_len);\n \t\t\tif (merge_msg.len)\n \t\t\t\tstrbuf_setlen(&merge_msg, merge_msg.len - 1);\n \t\t}\n-- \n1.7.2.2.409.gdbb11.dirty\n"},{"id":"148966","messageId":"1282733330-32334-4-git-send-email-artagnon@gmail.com","threadId":"24858","inReplyTo":"1282733330-32334-1-git-send-email-artagnon@gmail.com","subject":"[PATCH v6 3/3] merge: Make 'merge.log' an integer or boolean option","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-08-25T10:48:50Z","receivedAt":"2010-08-25T10:48:50Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Make 'merge.log' an integer or boolean option to set the number of\nshortlog entries to display in the merge commit. Note that it defaults\nto false, and that true means a default value of 20. Also update\ncorresponding documentation.\n\nSigned-off-by: Ramkumar Ramachandra \nThanks-to: Jonathan Nieder \nThanks-to: Johannes Sixt \n---\n Documentation/git-fmt-merge-msg.txt | 6 ++++--\n Documentation/merge-config.txt | 6 ++++--\n builtin/fmt-merge-msg.c | 14 +++++---------\n builtin/merge.c | 8 ++++++--\n 4 files changed, 19 insertions(+), 15 deletions(-)\n\ndiff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt\nindex f04a9ff..40dba8c 100644\n--- a/Documentation/git-fmt-merge-msg.txt\n+++ b/Documentation/git-fmt-merge-msg.txt\n@@ -54,8 +54,10 @@ CONFIGURATION\n -------------\n \n merge.log::\n-\tWhether to include summaries of merged commits in newly\n-\tmerge commit messages. False by default.\n+\tIn addition to branch names, populate the log message with at\n+\tmost the specified number of one-line descriptions from the\n+\tactual commits that are being merged. Defaults to false, and\n+\ttrue is a synoym for 20.\n \n merge.summary::\n \tSynonym to `merge.log`; this is deprecated and will be removed in\ndiff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt\nindex b72f533..92772e7 100644\n--- a/Documentation/merge-config.txt\n+++ b/Documentation/merge-config.txt\n@@ -7,8 +7,10 @@ merge.conflictstyle::\n \tmarker and the original text before the `=======` marker.\n \n merge.log::\n-\tWhether to include summaries of merged commits in newly created\n-\tmerge commit messages. False by default.\n+\tIn addition to branch names, populate the log message with at\n+\tmost the specified number of one-line descriptions from the\n+\tactual commits that are being merged. Defaults to false, and\n+\ttrue is a synoym for 20.\n \n merge.renameLimit::\n \tThe number of files to consider when performing rename detection\ndiff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c\nindex ec933df..b61416e 100644\n--- a/builtin/fmt-merge-msg.c\n+++ b/builtin/fmt-merge-msg.c\n@@ -15,15 +15,11 @@ static int shortlog_len;\n \n static int fmt_merge_msg_config(const char *key, const char *value, void *cb)\n {\n-\tstatic int found_merge_log = 0;\n-\tif (!strcmp(\"merge.log\", key)) {\n-\t\tfound_merge_log = 1;\n-\t\tshortlog_len = git_config_bool(key, value) ? DEFAULT_MERGE_LOG_LEN : 0;\n-\t\treturn 0;\n-\t}\n-\tif (!found_merge_log && !strcmp(\"merge.summary\", key)) {\n-\t\tshortlog_len = git_config_bool(key, value) ? DEFAULT_MERGE_LOG_LEN : 0;\n-\t\treturn 0;\n+\tif (!strcmp(key, \"merge.log\") || !strcmp(key, \"merge.summary\")) {\n+\t\tint is_bool;\n+\t\tshortlog_len = git_config_bool_or_int(key, value, &is_bool);\n+\t\tif (is_bool && shortlog_len)\n+\t\t\tshortlog_len = DEFAULT_MERGE_LOG_LEN;\n \t}\n \treturn 0;\n }\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex b067b84..45ff6d6 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -507,8 +507,12 @@ static int git_merge_config(const char *k, const char *v, void *cb)\n \t\treturn git_config_string(&pull_twohead, k, v);\n \telse if (!strcmp(k, \"pull.octopus\"))\n \t\treturn git_config_string(&pull_octopus, k, v);\n-\telse if (!strcmp(k, \"merge.log\") || !strcmp(k, \"merge.summary\"))\n-\t\tshortlog_len = git_config_bool(k, v) ? DEFAULT_MERGE_LOG_LEN : 0;\n+\telse if (!strcmp(k, \"merge.log\") || !strcmp(k, \"merge.summary\")) {\n+\t\tint is_bool;\n+\t\tshortlog_len = git_config_bool_or_int(k, v, &is_bool);\n+\t\tif (is_bool && shortlog_len)\n+\t\t\tshortlog_len = DEFAULT_MERGE_LOG_LEN;\n+\t}\n \telse if (!strcmp(k, \"merge.renormalize\"))\n \t\toption_renormalize = git_config_bool(k, v);\n \treturn git_diff_ui_config(k, v, cb);\n-- \n1.7.2.2.409.gdbb11.dirty\n"},{"id":"148992","messageId":"7vhbiiqv8p.fsf@alter.siamese.dyndns.org","threadId":"24858","inReplyTo":"1282733330-32334-1-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH v6 0/3] rr/fmt-merge-msg replacement","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-25T20:43:02Z","receivedAt":"2010-08-25T20:43:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra writes:\n\n> This is a replacement for rr/fmt-merge-msg. It corrects the problems\n> pointed out by Jonathan and adds one extra patch. Additionally, I've\n> rebased it so there's no merge conflict when you merge it into `pu`\n> (see: jn/merge-renormalize). 4/5 from v5 has been dropped.\n\nThanks, \n\nJust as a future reference, in a case like this that results in trivial\nconflict, I'd prefer to see a patch that can be used independently from\nother unrelated branches.\n\nMaybe you'd want a new test or two in t6200?\n"},{"id":"149032","messageId":"20100826051235.GA9407@kytes","threadId":"24858","inReplyTo":"7vhbiiqv8p.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v6 0/3] rr/fmt-merge-msg replacement","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2010-08-26T05:12:38Z","receivedAt":"2010-08-26T05:12:38Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Hi Junio,\n\nJunio C Hamano writes:\n> Ramkumar Ramachandra writes:\n> \n> > This is a replacement for rr/fmt-merge-msg. It corrects the problems\n> > pointed out by Jonathan and adds one extra patch. Additionally, I've\n> > rebased it so there's no merge conflict when you merge it into `pu`\n> > (see: jn/merge-renormalize). 4/5 from v5 has been dropped.\n> \n> Thanks, \n> \n> Just as a future reference, in a case like this that results in trivial\n> conflict, I'd prefer to see a patch that can be used independently from\n> other unrelated branches.\n\nOh, okay. I think I realize why- if the dependent topics are ejected,\nyou'll have more trouble taking this forward to `next` and `master`,\nright?\n\n> Maybe you'd want a new test or two in t6200?\n\nGood idea! It'll give me the chance to familiarize myself with\ntest-lib.sh :)\n\n-- Ram\n"},{"id":"149069","messageId":"7v7hjdmhtn.fsf@alter.siamese.dyndns.org","threadId":"24858","inReplyTo":"20100826051235.GA9407@kytes","subject":"Re: [PATCH v6 0/3] rr/fmt-merge-msg replacement","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-08-26T16:58:44Z","receivedAt":"2010-08-26T16:58:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra writes:\n\n>> Just as a future reference, in a case like this that results in trivial\n>> conflict, I'd prefer to see a patch that can be used independently from\n>> other unrelated branches.\n>\n> Oh, okay. I think I realize why- if the dependent topics are ejected,\n> you'll have more trouble taking this forward to `next` and `master`,\n> right?\n\nNot just \"ejection\". In general topics mature at different rates, and\nthere is no point requiring the other unrelated topic to graduate first to\n'master' before your topic does.\n\n>> Maybe you'd want a new test or two in t6200?\n>\n> Good idea! It'll give me the chance to familiarize myself with\n> test-lib.sh :)\n"}]}