diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:41 -0700 |
| commit | e25e6f3947403ed87cc016b7dc2c0692a5b6c2d2 (patch) | |
| tree | ad510c932c046ecf821a472500f90807ca24d960 /git-rebase--interactive.sh | |
| parent | 7b7e977b9625d0e5a4d4aa9fa6ffb62f083cbb6b (diff) | |
| parent | 1e461c4f1fc43a00c7f576a111b4f002ba2d2557 (diff) | |
| download | git-e25e6f3947403ed87cc016b7dc2c0692a5b6c2d2.tar.gz git-e25e6f3947403ed87cc016b7dc2c0692a5b6c2d2.tar.xz | |
Merge branch 'jk/rebase-i-drop-ident-check' into maint
Even when "git pull --rebase=preserve" (and the underlying "git
rebase --preserve") can complete without creating any new commit
(i.e. fast-forwards), it still insisted on having a usable ident
information (read: user.email is set correctly), which was less
than nice. As the underlying commands used inside "git rebase"
would fail with a more meaningful error message and advice text
when the bogus ident matters, this extra check was removed.
* jk/rebase-i-drop-ident-check:
rebase-interactive: drop early check for valid ident
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6fd6d4e5f..5e474e4a8 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1141,9 +1141,6 @@ To continue rebase after editing, run: ;; esac -git var GIT_COMMITTER_IDENT >/dev/null || - die "$(gettext "You need to set your committer info first")" - comment_for_reflog start if test ! -z "$switch_to" |