{"thread":{"id":"61313","subject":"[PATCH] merge-tree: fix argument type of the `--merge-base` option","startedAt":"2024-04-12T12:10:44Z","lastAt":"2024-04-12T16:09:23Z","messageCount":2,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"492867","messageId":"pull.1717.git.1712923841235.gitgitgadget@gmail.com","threadId":"61313","inReplyTo":null,"subject":"[PATCH] merge-tree: fix argument type of the `--merge-base` option","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-04-12T12:10:40Z","receivedAt":"2024-04-12T12:10:44Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nIn 5f43cf5b2e4 (merge-tree: accept 3 trees as arguments, 2024-01-28), I\ntaught `git merge-tree` to perform three-way merges on trees. This\ncommit even changed the manual page to state that the `--merge-base`\noption takes a tree-ish rather than requiring a commit.\n\nBut I forgot to adjust the in-program help text. This patch fixes that.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n    merge-tree: adjust argument type of the --merge-base option\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1717%2Fdscho%2Fmerge-tree-document-merge-base-treeish-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1717/dscho/merge-tree-document-merge-base-treeish-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1717\n\n builtin/merge-tree.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/merge-tree.c b/builtin/merge-tree.c\nindex 3492a575a6c..60eaf0ca9f1 100644\n--- a/builtin/merge-tree.c\n+++ b/builtin/merge-tree.c\n@@ -563,7 +563,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)\n \t\t\t   PARSE_OPT_NONEG),\n \t\tOPT_STRING(0, \"merge-base\",\n \t\t\t   &merge_base,\n-\t\t\t   N_(\"commit\"),\n+\t\t\t   N_(\"tree-ish\"),\n \t\t\t   N_(\"specify a merge-base for the merge\")),\n \t\tOPT_STRVEC('X', \"strategy-option\", &xopts, N_(\"option=value\"),\n \t\t\tN_(\"option for selected merge strategy\")),\n\nbase-commit: 342990c7aaef5ac645e89101cb84569caf64baf4\n-- \ngitgitgadget\n"},{"id":"492875","messageId":"xmqq7ch2pnpr.fsf@gitster.g","threadId":"61313","inReplyTo":"pull.1717.git.1712923841235.gitgitgadget@gmail.com","subject":"Re: [PATCH] merge-tree: fix argument type of the `--merge-base` option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-04-12T16:09:20Z","receivedAt":"2024-04-12T16:09:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" <gitgitgadget@gmail.com>\nwrites:\n\n> From: Johannes Schindelin <johannes.schindelin@gmx.de>\n>\n> In 5f43cf5b2e4 (merge-tree: accept 3 trees as arguments, 2024-01-28), I\n> taught `git merge-tree` to perform three-way merges on trees. This\n> commit even changed the manual page to state that the `--merge-base`\n> option takes a tree-ish rather than requiring a commit.\n>\n> But I forgot to adjust the in-program help text. This patch fixes that.\n\nThanks for being careful---better late than never ;-)\n\nWill queue and fast-track, as I do not see much chance of regression\ncoming from here.\n\n>\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n>     merge-tree: adjust argument type of the --merge-base option\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1717%2Fdscho%2Fmerge-tree-document-merge-base-treeish-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1717/dscho/merge-tree-document-merge-base-treeish-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1717\n>\n>  builtin/merge-tree.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c\n> index 3492a575a6c..60eaf0ca9f1 100644\n> --- a/builtin/merge-tree.c\n> +++ b/builtin/merge-tree.c\n> @@ -563,7 +563,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)\n>  \t\t\t   PARSE_OPT_NONEG),\n>  \t\tOPT_STRING(0, \"merge-base\",\n>  \t\t\t   &merge_base,\n> -\t\t\t   N_(\"commit\"),\n> +\t\t\t   N_(\"tree-ish\"),\n>  \t\t\t   N_(\"specify a merge-base for the merge\")),\n>  \t\tOPT_STRVEC('X', \"strategy-option\", &xopts, N_(\"option=value\"),\n>  \t\t\tN_(\"option for selected merge strategy\")),\n>\n> base-commit: 342990c7aaef5ac645e89101cb84569caf64baf4\n"}]}