{"thread":{"id":"65699","subject":"[PATCH 0/2] commit: remove deprecated functions","startedAt":"2026-05-27T14:00:12Z","lastAt":"2026-06-02T06:23:23Z","messageCount":13,"participants":["kristofferhaugsbakk@fastmail.com","Patrick Steinhardt","Kristoffer Haugsbakk","Jeff King","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"544153","messageId":"CV_commit.h_remove_deprecated.714@msgid.xyz","threadId":"65699","inReplyTo":null,"subject":"[PATCH 0/2] commit: remove deprecated functions","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-05-27T13:59:24Z","receivedAt":"2026-05-27T14:00:12Z","isPatch":true,"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nTopic name: kh/commit-deprecated\n\nTopic summary: Remove deprecated comments that were slated for removal\nafter Git 2.53.0.\n\nSee the comment:\n\n    /*\n     * Deprecated compatibility functions for `struct commit_list`, to be removed\n     * once Git 2.53 is released.\n     */\n\nI merged in `seen` and `next` yesterday and found no new in-flight usages\nof these functions.\n\nI commented on this patch but apparently it hasn’t hit any of these\nintegration branches yet:\n\nPatch: replay: support replaying 2-parent merges\nLink: https://lore.kernel.org/git/920cc022-8b63-4dbb-a41d-957ee01a5efd@app.fastmail.com/\n\n[1/2] *: replace deprecated free_commit_list\n[2/2] commit: remove deprecated functions\n\n builtin/history.c |  4 ++--\n commit.h          | 19 -------------------\n replay.c          |  2 +-\n upload-pack.c     |  4 ++--\n 4 files changed, 5 insertions(+), 24 deletions(-)\n\n\nbase-commit: 56a4f3c3a221adf1df9b39da69b8a6890f803157\n-- \n2.54.0.6.gf6fa7dd4140\n\n"},{"id":"544154","messageId":"commit.h_replace_deprecated.715@msgid.xyz","threadId":"65699","inReplyTo":"CV_commit.h_remove_deprecated.714@msgid.xyz","subject":"[PATCH 1/2] *: replace deprecated free_commit_list","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-05-27T13:59:25Z","receivedAt":"2026-05-27T14:00:31Z","isPatch":true,"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nReplace `free_commit_list` with `commit_list_free`. The former was\ndeprecated in 9f18d089 (commit: rename `free_commit_list()` to conform\nto coding guidelines, 2026-01-15).\n\nThis allows us to remove all the deprecated functions in the\nnext commit:\n\n• `copy_commit_list`\n• `reverse_commit_list`\n• `free_commit_list`\n\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n builtin/history.c | 4 ++--\n replay.c          | 2 +-\n upload-pack.c     | 4 ++--\n 3 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/history.c b/builtin/history.c\nindex 0fc06fb2045..091465a59e2 100644\n--- a/builtin/history.c\n+++ b/builtin/history.c\n@@ -284,7 +284,7 @@ static int setup_revwalk(struct repository *repo,\n \n \t\tcommit_list_insert(original, &from_list);\n \t\tret = repo_is_descendant_of(repo, head, from_list);\n-\t\tfree_commit_list(from_list);\n+\t\tcommit_list_free(from_list);\n \n \t\tif (ret < 0) {\n \t\t\tret = error(_(\"cannot determine descendance\"));\n@@ -892,7 +892,7 @@ static int split_commit(struct repository *repo,\n \tif (index_file.len)\n \t\tunlink(index_file.buf);\n \tstrbuf_release(&index_file);\n-\tfree_commit_list(parents);\n+\tcommit_list_free(parents);\n \trelease_index(&index);\n \treturn ret;\n }\ndiff --git a/replay.c b/replay.c\nindex 4ef8abb6077..da531d5bc68 100644\n--- a/replay.c\n+++ b/replay.c\n@@ -120,7 +120,7 @@ static struct commit *create_commit(struct repository *repo,\n out:\n \trepo_unuse_commit_buffer(repo, based_on, message);\n \tfree_commit_extra_headers(extra);\n-\tfree_commit_list(parents);\n+\tcommit_list_free(parents);\n \tstrbuf_release(&msg);\n \tfree(author);\n \treturn (struct commit *)obj;\ndiff --git a/upload-pack.c b/upload-pack.c\nindex 9f6d6fe48c8..2bf450ab288 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -886,7 +886,7 @@ static void deepen(struct upload_pack_data *data, int depth)\n \t\t\t\t\t     data->deepen_relative, depth,\n \t\t\t\t\t     SHALLOW, NOT_SHALLOW);\n \t\tsend_shallow(data, result);\n-\t\tfree_commit_list(result);\n+\t\tcommit_list_free(result);\n \t}\n \n \tsend_unshallow(data);\n@@ -900,7 +900,7 @@ static void deepen_by_rev_list(struct upload_pack_data *data,\n \tdisable_commit_graph(the_repository);\n \tresult = get_shallow_commits_by_rev_list(argv, SHALLOW, NOT_SHALLOW);\n \tsend_shallow(data, result);\n-\tfree_commit_list(result);\n+\tcommit_list_free(result);\n \tsend_unshallow(data);\n }\n \n-- \n2.54.0.6.gf6fa7dd4140\n\n"},{"id":"544155","messageId":"commit.h_remove_deprecated.716@msgid.xyz","threadId":"65699","inReplyTo":"CV_commit.h_remove_deprecated.714@msgid.xyz","subject":"[PATCH 2/2] commit: remove deprecated functions","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-05-27T13:59:26Z","receivedAt":"2026-05-27T14:00:50Z","isPatch":true,"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nThese functions were deprecated in a series of commits merged in\n52882024 (Merge branch 'ps/commit-list-functions-renamed', 2026-02-13).\n\nThe compatibility was for in-flight topics at the time.\n\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n commit.h | 19 -------------------\n 1 file changed, 19 deletions(-)\n\ndiff --git a/commit.h b/commit.h\nindex 58150045afa..5352056f87a 100644\n--- a/commit.h\n+++ b/commit.h\n@@ -203,25 +203,6 @@ struct commit_list *commit_list_reverse(struct commit_list *list);\n \n void commit_list_free(struct commit_list *list);\n \n-/*\n- * Deprecated compatibility functions for `struct commit_list`, to be removed\n- * once Git 2.53 is released.\n- */\n-static inline struct commit_list *copy_commit_list(struct commit_list *l)\n-{\n-\treturn commit_list_copy(l);\n-}\n-\n-static inline struct commit_list *reverse_commit_list(struct commit_list *l)\n-{\n-\treturn commit_list_reverse(l);\n-}\n-\n-static inline void free_commit_list(struct commit_list *l)\n-{\n-\tcommit_list_free(l);\n-}\n-\n struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */\n \n const char *repo_logmsg_reencode(struct repository *r,\n-- \n2.54.0.6.gf6fa7dd4140\n\n"},{"id":"544209","messageId":"ahfRdFXJf9SRaz5q@pks.im","threadId":"65699","inReplyTo":"commit.h_replace_deprecated.715@msgid.xyz","subject":"Re: [PATCH 1/2] *: replace deprecated free_commit_list","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-05-28T05:24:04Z","receivedAt":"2026-05-28T05:24:11Z","isPatch":true,"body":"On Wed, May 27, 2026 at 03:59:25PM +0200, kristofferhaugsbakk@fastmail.com wrote:\n> From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n> \n> Replace `free_commit_list` with `commit_list_free`. The former was\n> deprecated in 9f18d089 (commit: rename `free_commit_list()` to conform\n> to coding guidelines, 2026-01-15).\n> \n> This allows us to remove all the deprecated functions in the\n> next commit:\n> \n> • `copy_commit_list`\n> • `reverse_commit_list`\n> • `free_commit_list`\n> \n> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n> ---\n>  builtin/history.c | 4 ++--\n>  replay.c          | 2 +-\n>  upload-pack.c     | 4 ++--\n>  3 files changed, 5 insertions(+), 5 deletions(-)\n\nHeh. Funny to see that I introduced the new functions, and that I was\nalso the one that continued using the old ones most :)\n\nPatrick\n"},{"id":"544210","messageId":"ahfRevYta06fOaKS@pks.im","threadId":"65699","inReplyTo":"commit.h_remove_deprecated.716@msgid.xyz","subject":"Re: [PATCH 2/2] commit: remove deprecated functions","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-05-28T05:24:10Z","receivedAt":"2026-05-28T05:24:14Z","isPatch":true,"body":"On Wed, May 27, 2026 at 03:59:26PM +0200, kristofferhaugsbakk@fastmail.com wrote:\n> From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n> \n> These functions were deprecated in a series of commits merged in\n> 52882024 (Merge branch 'ps/commit-list-functions-renamed', 2026-02-13).\n> \n> The compatibility was for in-flight topics at the time.\n\nYup, makes sense. Thanks for following through with the cleanup!\n\nPatrick\n"},{"id":"544215","messageId":"ecf0e826-759a-4922-acf7-94abb689856e@app.fastmail.com","threadId":"65699","inReplyTo":"ahfRdFXJf9SRaz5q@pks.im","subject":"Re: [PATCH 1/2] *: replace deprecated free_commit_list","fromName":"Kristoffer Haugsbakk","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-05-28T06:49:13Z","receivedAt":"2026-05-28T06:49:35Z","isPatch":true,"body":"On Thu, May 28, 2026, at 07:24, Patrick Steinhardt wrote:\n> On Wed, May 27, 2026 at 03:59:25PM +0200,\n>>[snip]\n>> ---\n>>  builtin/history.c | 4 ++--\n>>  replay.c          | 2 +-\n>>  upload-pack.c     | 4 ++--\n>>  3 files changed, 5 insertions(+), 5 deletions(-)\n>\n> Heh. Funny to see that I introduced the new functions, and that I was\n> also the one that continued using the old ones most :)\n\nTo be honest with you that’s the first thing I checked. “I wonder if\nPatrick...” x)\n"},{"id":"544216","messageId":"V2_CV_commit.h_remove_deprecated.732@msgid.xyz","threadId":"65699","inReplyTo":"CV_commit.h_remove_deprecated.714@msgid.xyz","subject":"[PATCH v2 0/2] commit: remove deprecated functions","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-05-28T07:00:09Z","receivedAt":"2026-05-28T07:00:42Z","isPatch":true,"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nTopic name: kh/commit-deprecated\n\nTopic summary: Remove deprecated comments that were slated for removal\nafter Git 2.53.0.\n\nSee the comment:\n\n    /*\n     * Deprecated compatibility functions for `struct commit_list`, to be removed\n     * once Git 2.53 is released.\n     */\n\nI merged in `seen` and `next` yesterday and found no new in-flight usages\nof these functions.\n\nUpdate Thursday: retested `seen` (commit [1]) and `next` (commit [2]).\n\n† 1: 7821a69c (Merge branch 'za/completion-hide-dotfiles' into seen, 2026-05-27)\n† 2: 2f8565e1 (Sync with 'master', 2026-05-27)\n\nI commented on this patch but apparently it hasn’t hit any of these\nintegration branches yet:\n\nPatch: replay: support replaying 2-parent merges\nLink: https://lore.kernel.org/git/920cc022-8b63-4dbb-a41d-957ee01a5efd@app.fastmail.com/\n\n§ Changes v2\n\nAdd ack by Patrick, the author of these compatibility functions.\n\n§ Link to v1\n\nhttps://lore.kernel.org/git/CV_commit.h_remove_deprecated.714@msgid.xyz/#t\n\n[1/2] *: replace deprecated free_commit_list\n[2/2] commit: remove deprecated functions\n\n builtin/history.c |  4 ++--\n commit.h          | 19 -------------------\n replay.c          |  2 +-\n upload-pack.c     |  4 ++--\n 4 files changed, 5 insertions(+), 24 deletions(-)\n\nInterdiff against v1:\n\nbase-commit: 56a4f3c3a221adf1df9b39da69b8a6890f803157\n-- \n2.54.0.16.g8f27b399cbe\n\n"},{"id":"544217","messageId":"V2_commit.h_replace_deprecated.733@msgid.xyz","threadId":"65699","inReplyTo":"V2_CV_commit.h_remove_deprecated.732@msgid.xyz","subject":"[PATCH v2 1/2] *: replace deprecated free_commit_list","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-05-28T07:00:10Z","receivedAt":"2026-05-28T07:01:01Z","isPatch":true,"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nReplace `free_commit_list` with `commit_list_free`. The former was\ndeprecated in 9f18d089 (commit: rename `free_commit_list()` to conform\nto coding guidelines, 2026-01-15).\n\nThis allows us to remove all the deprecated functions in the\nnext commit:\n\n• `copy_commit_list`\n• `reverse_commit_list`\n• `free_commit_list`\n\nAcked-by: Patrick Steinhardt <ps@pks.im>\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n\nNotes (series):\n    v2: add ack\n\n builtin/history.c | 4 ++--\n replay.c          | 2 +-\n upload-pack.c     | 4 ++--\n 3 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/builtin/history.c b/builtin/history.c\nindex 0fc06fb2045..091465a59e2 100644\n--- a/builtin/history.c\n+++ b/builtin/history.c\n@@ -284,7 +284,7 @@ static int setup_revwalk(struct repository *repo,\n \n \t\tcommit_list_insert(original, &from_list);\n \t\tret = repo_is_descendant_of(repo, head, from_list);\n-\t\tfree_commit_list(from_list);\n+\t\tcommit_list_free(from_list);\n \n \t\tif (ret < 0) {\n \t\t\tret = error(_(\"cannot determine descendance\"));\n@@ -892,7 +892,7 @@ static int split_commit(struct repository *repo,\n \tif (index_file.len)\n \t\tunlink(index_file.buf);\n \tstrbuf_release(&index_file);\n-\tfree_commit_list(parents);\n+\tcommit_list_free(parents);\n \trelease_index(&index);\n \treturn ret;\n }\ndiff --git a/replay.c b/replay.c\nindex 4ef8abb6077..da531d5bc68 100644\n--- a/replay.c\n+++ b/replay.c\n@@ -120,7 +120,7 @@ static struct commit *create_commit(struct repository *repo,\n out:\n \trepo_unuse_commit_buffer(repo, based_on, message);\n \tfree_commit_extra_headers(extra);\n-\tfree_commit_list(parents);\n+\tcommit_list_free(parents);\n \tstrbuf_release(&msg);\n \tfree(author);\n \treturn (struct commit *)obj;\ndiff --git a/upload-pack.c b/upload-pack.c\nindex 9f6d6fe48c8..2bf450ab288 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -886,7 +886,7 @@ static void deepen(struct upload_pack_data *data, int depth)\n \t\t\t\t\t     data->deepen_relative, depth,\n \t\t\t\t\t     SHALLOW, NOT_SHALLOW);\n \t\tsend_shallow(data, result);\n-\t\tfree_commit_list(result);\n+\t\tcommit_list_free(result);\n \t}\n \n \tsend_unshallow(data);\n@@ -900,7 +900,7 @@ static void deepen_by_rev_list(struct upload_pack_data *data,\n \tdisable_commit_graph(the_repository);\n \tresult = get_shallow_commits_by_rev_list(argv, SHALLOW, NOT_SHALLOW);\n \tsend_shallow(data, result);\n-\tfree_commit_list(result);\n+\tcommit_list_free(result);\n \tsend_unshallow(data);\n }\n \n-- \n2.54.0.16.g8f27b399cbe\n\n"},{"id":"544218","messageId":"V2_commit.h_remove_deprecated.734@msgid.xyz","threadId":"65699","inReplyTo":"V2_CV_commit.h_remove_deprecated.732@msgid.xyz","subject":"[PATCH v2 2/2] commit: remove deprecated functions","fromName":"","fromEmail":"kristofferhaugsbakk@fastmail.com","sentAt":"2026-05-28T07:00:11Z","receivedAt":"2026-05-28T07:01:21Z","isPatch":true,"body":"From: Kristoffer Haugsbakk <code@khaugsbakk.name>\n\nThese functions were deprecated in a series of commits merged in\n52882024 (Merge branch 'ps/commit-list-functions-renamed', 2026-02-13).\n\nThe compatibility was for in-flight topics at the time.\n\nAcked-by: Patrick Steinhardt <ps@pks.im>\nSigned-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>\n---\n\nNotes (series):\n    v2: add ack\n\n commit.h | 19 -------------------\n 1 file changed, 19 deletions(-)\n\ndiff --git a/commit.h b/commit.h\nindex 58150045afa..5352056f87a 100644\n--- a/commit.h\n+++ b/commit.h\n@@ -203,25 +203,6 @@ struct commit_list *commit_list_reverse(struct commit_list *list);\n \n void commit_list_free(struct commit_list *list);\n \n-/*\n- * Deprecated compatibility functions for `struct commit_list`, to be removed\n- * once Git 2.53 is released.\n- */\n-static inline struct commit_list *copy_commit_list(struct commit_list *l)\n-{\n-\treturn commit_list_copy(l);\n-}\n-\n-static inline struct commit_list *reverse_commit_list(struct commit_list *l)\n-{\n-\treturn commit_list_reverse(l);\n-}\n-\n-static inline void free_commit_list(struct commit_list *l)\n-{\n-\tcommit_list_free(l);\n-}\n-\n struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */\n \n const char *repo_logmsg_reencode(struct repository *r,\n-- \n2.54.0.16.g8f27b399cbe\n\n"},{"id":"544263","messageId":"20260529083716.GE1106035@coredump.intra.peff.net","threadId":"65699","inReplyTo":"V2_CV_commit.h_remove_deprecated.732@msgid.xyz","subject":"Re: [PATCH v2 0/2] commit: remove deprecated functions","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2026-05-29T08:37:16Z","receivedAt":"2026-05-29T08:37:17Z","isPatch":true,"body":"On Thu, May 28, 2026 at 09:00:09AM +0200, kristofferhaugsbakk@fastmail.com wrote:\n\n> Topic summary: Remove deprecated comments that were slated for removal\n> after Git 2.53.0.\n\nThis looks obviously correct to me, but the whole topic made me wonder:\nwas it worth retaining the old names and deprecating them, versus just\nremoving them back then?\n\nTopics in flight would have needed an update then, but they did\neventually anyway. So it feels like the total amount of work done is\nlarger, compared to just fixing them as the topics were merged. Either\nway the compiler tells us, and the adjustments themselves are small.\n\nNot a huge deal either way, but just pondering for future such\nsituations.\n\n-Peff\n"},{"id":"544343","messageId":"ah0fahsc-a6JvYi-@pks.im","threadId":"65699","inReplyTo":"20260529083716.GE1106035@coredump.intra.peff.net","subject":"Re: [PATCH v2 0/2] commit: remove deprecated functions","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2026-06-01T05:58:02Z","receivedAt":"2026-06-01T05:58:09Z","isPatch":true,"body":"On Fri, May 29, 2026 at 04:37:16AM -0400, Jeff King wrote:\n> On Thu, May 28, 2026 at 09:00:09AM +0200, kristofferhaugsbakk@fastmail.com wrote:\n> \n> > Topic summary: Remove deprecated comments that were slated for removal\n> > after Git 2.53.0.\n> \n> This looks obviously correct to me, but the whole topic made me wonder:\n> was it worth retaining the old names and deprecating them, versus just\n> removing them back then?\n> \n> Topics in flight would have needed an update then, but they did\n> eventually anyway. So it feels like the total amount of work done is\n> larger, compared to just fixing them as the topics were merged. Either\n> way the compiler tells us, and the adjustments themselves are small.\n> \n> Not a huge deal either way, but just pondering for future such\n> situations.\n\nYeah, I'm always very torn on these myself. I guess ultimately it's\nalways going to be dependent on the actual refactoring: the bigger the\nblast radius, the more it makes sense to have a transition period so\nthat we don't break in-flight patch series.\n\nWhere exactly that line is is a different question of course.\n\nPatrick\n"},{"id":"544348","messageId":"xmqqa4te91g7.fsf@gitster.g","threadId":"65699","inReplyTo":"20260529083716.GE1106035@coredump.intra.peff.net","subject":"Re: [PATCH v2 0/2] commit: remove deprecated functions","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-06-01T07:14:48Z","receivedAt":"2026-06-01T07:14:52Z","isPatch":true,"body":"Jeff King <peff@peff.net> writes:\n\n> On Thu, May 28, 2026 at 09:00:09AM +0200, kristofferhaugsbakk@fastmail.com wrote:\n>\n>> Topic summary: Remove deprecated comments that were slated for removal\n>> after Git 2.53.0.\n>\n> This looks obviously correct to me, but the whole topic made me wonder:\n> was it worth retaining the old names and deprecating them, versus just\n> removing them back then?\n>\n> Topics in flight would have needed an update then, but they did\n> eventually anyway. So it feels like the total amount of work done is\n> larger, compared to just fixing them as the topics were merged. Either\n> way the compiler tells us, and the adjustments themselves are small.\n\nYour alternative approach will depend on the integrator doing all\nthe fixups at the merge time.\n\nThe amount of effort required by the entire community as a whole may\nhave been larger, but the way the rename was carried out did spread\nthem thinner.\n\nAdmittedly, with help from rerere and merge-fix mechanism, such a\n\"fixup at the merge time\" typically needs to be done only once per\nthe other conflicting topic in flight, but still, when constructing\na workflow, I try to avoid having to depend on the single bottleneck\nfor a task that does not need to be performed by the single\nbottleneck, especially when the single bottleneck has other tasks\nthat can only be done by the single bottleneck.\n\n> Not a huge deal either way, but just pondering for future such\n> situations.\n>\n> -Peff\n"},{"id":"544457","messageId":"20260602062322.GB695568@coredump.intra.peff.net","threadId":"65699","inReplyTo":"xmqqa4te91g7.fsf@gitster.g","subject":"Re: [PATCH v2 0/2] commit: remove deprecated functions","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2026-06-02T06:23:22Z","receivedAt":"2026-06-02T06:23:23Z","isPatch":true,"body":"On Mon, Jun 01, 2026 at 04:14:48PM +0900, Junio C Hamano wrote:\n\n> > This looks obviously correct to me, but the whole topic made me wonder:\n> > was it worth retaining the old names and deprecating them, versus just\n> > removing them back then?\n> >\n> > Topics in flight would have needed an update then, but they did\n> > eventually anyway. So it feels like the total amount of work done is\n> > larger, compared to just fixing them as the topics were merged. Either\n> > way the compiler tells us, and the adjustments themselves are small.\n> \n> Your alternative approach will depend on the integrator doing all\n> the fixups at the merge time.\n> \n> The amount of effort required by the entire community as a whole may\n> have been larger, but the way the rename was carried out did spread\n> them thinner.\n\nTrue, though my thinking was two-fold:\n\n  - Topics in flight that you _haven't_ picked up yet are not your\n    problem. They become the problem of their authors, as long as they\n    build on top of the change in question (either originally, or via\n    rebase).\n\n  - It's also work to pick up the new topic. So there's some tradeoff\n    for the maintainer in how many fixups (and how much effort for each\n    one) versus the work to juggle a new topic.\n\n> Admittedly, with help from rerere and merge-fix mechanism, such a\n> \"fixup at the merge time\" typically needs to be done only once per\n> the other conflicting topic in flight, but still, when constructing\n> a workflow, I try to avoid having to depend on the single bottleneck\n> for a task that does not need to be performed by the single\n> bottleneck, especially when the single bottleneck has other tasks\n> that can only be done by the single bottleneck.\n\nYeah, I think that is a good philosophy in general. I just wondered\nwhether the tradeoff was right here (but I'm happy to defer to you for\nthe final call on that).\n\n-Peff\n"}]}