[PATCH] rebase -i: fix has_action
- From
- Noe Rubinstein <nrubinstein@proformatique.com>
- Date
- Aug 4, 2011, 09:39 UTC
- Message-ID
- <1312450780-5021-1-git-send-email-nrubinstein@proformatique.com>
When doing git rebase -i, removing all actions in the todo list is supposed to result in aborting the rebase. However, if there are spaces at the beginning of an empty line, has_action returns true and the rebase therefore removes all commits. This is probably not what a user leaving a space on an empty line expects.
This patch fixes the bug by changing has_action to grep any line containing anything that is not a space nor a #.
Signed-off-by: Noe Rubinstein <nrubinstein@proformatique.com> --- git-rebase--interactive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c6ba7c1..bed79af 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -149,7 +149,7 @@ die_abort () { } has_action () { - sane_grep '^[^#]' "$1" >/dev/null + sane_grep '^[^#[:space:]]' "$1" >/dev/null } # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
-- Noé Rubinstein Avencall - XiVO IPBX OpenHardware 10 bis, rue Lucien VOILIN - 92800 Puteaux Tél. : +33 (0)1 41 38 99 60 ext 123 Fax. : +33 (0)1 41 38 99 70