{"thread":{"id":"60684","subject":"[PATCH] rebase: clarify --reschedule-failed-exec default","startedAt":"2024-01-04T08:10:12Z","lastAt":"2024-01-05T17:11:09Z","messageCount":7,"participants":["Illia Bobyr","Taylor Blau"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"486282","messageId":"20240104080631.3666413-1-illia.bobyr@gmail.com","threadId":"60684","inReplyTo":null,"subject":"[PATCH] rebase: clarify --reschedule-failed-exec default","fromName":"Illia Bobyr","fromEmail":"illia.bobyr@gmail.com","sentAt":"2024-01-04T08:06:31Z","receivedAt":"2024-01-04T08:10:12Z","isPatch":true,"sender":{"key":"illia.bobyr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/694419?v=4"},"body":"Documentation should mention the default behavior.\n\nIt is better to explain the persistent nature of the\n--reschedule-failed-exec flag from the user standpoint, rather than from\nthe implementation standpoint.\n\nSigned-off-by: Illia Bobyr <illia.bobyr@gmail.com>\n---\n Documentation/git-rebase.txt | 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)\n\ndiff --git Documentation/git-rebase.txt Documentation/git-rebase.txt\nindex 1dd65..45d3c 100644\n--- Documentation/git-rebase.txt\n+++ Documentation/git-rebase.txt\n@@ -626,13 +626,16 @@ See also INCOMPATIBLE OPTIONS below.\n \tAutomatically reschedule `exec` commands that failed. This only makes\n \tsense in interactive mode (or when an `--exec` option was provided).\n +\n-Even though this option applies once a rebase is started, it's set for\n-the whole rebase at the start based on either the\n-`rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1]\n-or \"CONFIGURATION\" below) or whether this option is\n-provided. Otherwise an explicit `--no-reschedule-failed-exec` at the\n-start would be overridden by the presence of\n-`rebase.rescheduleFailedExec=true` configuration.\n+This option applies once a rebase is started. It is preserved for the whole\n+rebase based on, in order, the command line option provided to the initial `git\n+rebase`, the `rebase.rescheduleFailedExec` configuration (see\n+linkgit:git-config[1] or \"CONFIGURATION\" below), or it defaults to false.\n++\n+Recording this option for the whole rebase is a convenience feature. Otherwise\n+an explicit `--no-reschedule-failed-exec` at the start would be overridden by\n+the presence of a `rebase.rescheduleFailedExec=true` configuration when `git\n+rebase --continue` is invoked. Currently, you can not, pass\n+`--[no-]reschedule-failed-exec` to `git rebase --continue`.\n \n --update-refs::\n --no-update-refs::\n-- \n2.40.1\n\n"},{"id":"486307","messageId":"ZZcE/Kw24YKlqSOT@nand.local","threadId":"60684","inReplyTo":"20240104080631.3666413-1-illia.bobyr@gmail.com","subject":"Re: [PATCH] rebase: clarify --reschedule-failed-exec default","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2024-01-04T19:20:28Z","receivedAt":"2024-01-04T19:20:30Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Thu, Jan 04, 2024 at 12:06:31AM -0800, Illia Bobyr wrote:\n> Documentation should mention the default behavior.\n>\n> It is better to explain the persistent nature of the\n> --reschedule-failed-exec flag from the user standpoint, rather than from\n> the implementation standpoint.\n\nThe first paragraph looks good, and I think your wording is an\nimprovement over what's already there (though of course this is\nsubjective, and YMMV).\n\n> +Recording this option for the whole rebase is a convenience feature. Otherwise\n> +an explicit `--no-reschedule-failed-exec` at the start would be overridden by\n> +the presence of a `rebase.rescheduleFailedExec=true` configuration when `git\n> +rebase --continue` is invoked. Currently, you can not, pass\n> +`--[no-]reschedule-failed-exec` to `git rebase --continue`.\n\nThe last sentence was a bit confusing to me. I assume you meant\n\n    Currently, you cannot pass `--[no-]reschedule-failed-exec` [...]\n\nwithout the comma between \"pass\" and \"`--[no]reschedule-failed-exect`\",\nand replacing \"can not\" with \"cannot\".\n\nThanks,\nTaylor\n"},{"id":"486327","messageId":"20240105004246.1317445-1-illia.bobyr@gmail.com","threadId":"60684","inReplyTo":"ZZcE/Kw24YKlqSOT@nand.local","subject":"[PATCH v2] rebase: clarify --reschedule-failed-exec default","fromName":"Illia Bobyr","fromEmail":"illia.bobyr@gmail.com","sentAt":"2024-01-05T00:42:45Z","receivedAt":"2024-01-05T00:43:42Z","isPatch":true,"sender":{"key":"illia.bobyr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/694419?v=4"},"body":"Applied.\nThank you for reviewing!\n\n\n"},{"id":"486328","messageId":"20240105004246.1317445-2-illia.bobyr@gmail.com","threadId":"60684","inReplyTo":"20240105004246.1317445-1-illia.bobyr@gmail.com","subject":"[PATCH v2] rebase: clarify --reschedule-failed-exec default","fromName":"Illia Bobyr","fromEmail":"illia.bobyr@gmail.com","sentAt":"2024-01-05T00:42:46Z","receivedAt":"2024-01-05T00:43:53Z","isPatch":true,"sender":{"key":"illia.bobyr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/694419?v=4"},"body":"Documentation should mention the default behavior.\n\nIt is better to explain the persistent nature of the\n--reschedule-failed-exec flag from the user standpoint, rather than from\nthe implementation standpoint.\n\nSigned-off-by: Illia Bobyr <illia.bobyr@gmail.com>\n---\n Documentation/git-rebase.txt | 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)\n\ndiff --git Documentation/git-rebase.txt Documentation/git-rebase.txt\nindex 1dd65..45d3c 100644\n--- Documentation/git-rebase.txt\n+++ Documentation/git-rebase.txt\n@@ -626,13 +626,16 @@ See also INCOMPATIBLE OPTIONS below.\n \tAutomatically reschedule `exec` commands that failed. This only makes\n \tsense in interactive mode (or when an `--exec` option was provided).\n +\n-Even though this option applies once a rebase is started, it's set for\n-the whole rebase at the start based on either the\n-`rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1]\n-or \"CONFIGURATION\" below) or whether this option is\n-provided. Otherwise an explicit `--no-reschedule-failed-exec` at the\n-start would be overridden by the presence of\n-`rebase.rescheduleFailedExec=true` configuration.\n+This option applies once a rebase is started. It is preserved for the whole\n+rebase based on, in order, the command line option provided to the initial `git\n+rebase`, the `rebase.rescheduleFailedExec` configuration (see\n+linkgit:git-config[1] or \"CONFIGURATION\" below), or it defaults to false.\n++\n+Recording this option for the whole rebase is a convenience feature. Otherwise\n+an explicit `--no-reschedule-failed-exec` at the start would be overridden by\n+the presence of a `rebase.rescheduleFailedExec=true` configuration when `git\n+rebase --continue` is invoked. Currently, you can not, pass\n+`--[no-]reschedule-failed-exec` to `git rebase --continue`.\n \n --update-refs::\n --no-update-refs::\n-- \n2.40.1\n\n"},{"id":"486331","messageId":"20240105011424.1443732-1-illia.bobyr@gmail.com","threadId":"60684","inReplyTo":"ZZcE/Kw24YKlqSOT@nand.local","subject":"[PATCH v3] rebase: clarify --reschedule-failed-exec default","fromName":"Illia Bobyr","fromEmail":"illia.bobyr@gmail.com","sentAt":"2024-01-05T01:14:24Z","receivedAt":"2024-01-05T01:15:03Z","isPatch":true,"sender":{"key":"illia.bobyr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/694419?v=4"},"body":"Sorry, I did not actually include the change in v2.\nStill learning how to use git send-email.\n\nOn Thu, Jan 04, 2024 at 11:20:28AM -0800, Taylor Blau wrote:\n> [...]\n>\n> > +Recording this option for the whole rebase is a convenience feature. Otherwise\n> > +an explicit `--no-reschedule-failed-exec` at the start would be overridden by\n> > +the presence of a `rebase.rescheduleFailedExec=true` configuration when `git\n> > +rebase --continue` is invoked. Currently, you can not, pass\n> > +`--[no-]reschedule-failed-exec` to `git rebase --continue`.\n> \n> The last sentence was a bit confusing to me. I assume you meant\n> \n>     Currently, you cannot pass `--[no-]reschedule-failed-exec` [...]\n> \n> without the comma between \"pass\" and \"`--[no]reschedule-failed-exect`\",\n> and replacing \"can not\" with \"cannot\".\n\nApplied.\nThank you for reviewing!\n"},{"id":"486332","messageId":"20240105011424.1443732-2-illia.bobyr@gmail.com","threadId":"60684","inReplyTo":"ZZcE/Kw24YKlqSOT@nand.local","subject":"[PATCH v3] rebase: clarify --reschedule-failed-exec default","fromName":"Illia Bobyr","fromEmail":"illia.bobyr@gmail.com","sentAt":"2024-01-05T01:14:26Z","receivedAt":"2024-01-05T01:15:23Z","isPatch":true,"sender":{"key":"illia.bobyr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/694419?v=4"},"body":"Documentation should mention the default behavior.\n\nIt is better to explain the persistent nature of the\n--reschedule-failed-exec flag from the user standpoint, rather than from\nthe implementation standpoint.\n\nSigned-off-by: Illia Bobyr <illia.bobyr@gmail.com>\n---\n Documentation/git-rebase.txt | 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)\n\ndiff --git Documentation/git-rebase.txt Documentation/git-rebase.txt\nindex 1dd65..b6282 100644\n--- Documentation/git-rebase.txt\n+++ Documentation/git-rebase.txt\n@@ -626,13 +626,16 @@ See also INCOMPATIBLE OPTIONS below.\n \tAutomatically reschedule `exec` commands that failed. This only makes\n \tsense in interactive mode (or when an `--exec` option was provided).\n +\n-Even though this option applies once a rebase is started, it's set for\n-the whole rebase at the start based on either the\n-`rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1]\n-or \"CONFIGURATION\" below) or whether this option is\n-provided. Otherwise an explicit `--no-reschedule-failed-exec` at the\n-start would be overridden by the presence of\n-`rebase.rescheduleFailedExec=true` configuration.\n+This option applies once a rebase is started. It is preserved for the whole\n+rebase based on, in order, the command line option provided to the initial `git\n+rebase`, the `rebase.rescheduleFailedExec` configuration (see\n+linkgit:git-config[1] or \"CONFIGURATION\" below), or it defaults to false.\n++\n+Recording this option for the whole rebase is a convenience feature. Otherwise\n+an explicit `--no-reschedule-failed-exec` at the start would be overridden by\n+the presence of a `rebase.rescheduleFailedExec=true` configuration when `git\n+rebase --continue` is invoked. Currently, you cannot pass\n+`--[no-]reschedule-failed-exec` to `git rebase --continue`.\n \n --update-refs::\n --no-update-refs::\n-- \n2.40.1\n\n"},{"id":"486349","messageId":"ZZg4LO7L2q8GtLHh@nand.local","threadId":"60684","inReplyTo":"20240105011424.1443732-2-illia.bobyr@gmail.com","subject":"Re: [PATCH v3] rebase: clarify --reschedule-failed-exec default","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2024-01-05T17:11:08Z","receivedAt":"2024-01-05T17:11:09Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Thu, Jan 04, 2024 at 05:14:26PM -0800, Illia Bobyr wrote:\n> ---\n>  Documentation/git-rebase.txt | 17 ++++++++++-------\n>  1 file changed, 10 insertions(+), 7 deletions(-)\n\nLGTM.\n\nThanks,\nTaylor\n"}]}