Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rebase: add a config option to default to --reschedule-failed-exec
It would be cumbersome to type out that option all the time, so let's offer the convenience of a config setting: rebase.rescheduleFailedExec. Besides, this opens the door to changing the default in a future version of Git: it does make some sense to reschedule failed `exec` commands by default (and if we could go back in time when the `exec` command was invented, we probably would change that default right from the start). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information
Showing
4 changed files
with
18 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
969de3f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dscho The
--reschedule-failed-exec
option is great. Thanks. But therebase.rescheduleFailedExec
.gitconfig
option is useless for most people as currently implemented since it prevents users from doing non-interactive rebases. Any attempt to do so results in:969de3f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True. It is a pity that this was buried in my GitHub notifications and has not been discussed on the Git mailing list. Now it is too late to slip in a fix into v2.22.0, I think.
969de3f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See gitgitgadget#253. And next time, please do use a bug tracker, or even better the Git mailing list.
969de3f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dscho I just ran in to this, and I'm glad I did because it taught me that gitgitgadget exists :)
969de3f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:-)
969de3f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FWIW the issue reported here is slated to be fixed in Git v2.23.0, so at least it got fixed, if late.
969de3f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm looking forward to that. I just (days ago) needed to use that feature and then yesterday had this problem happen. Looks like 2.23.0 is coming soon enough that I won't forget to uncomment the setting in my .gitconfig :)
969de3f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dakotahawkins please note that -rc0 and -rc1 are out, you can already install them (and test them, and give feedback on them 😃).