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
This commit is contained in:
Junio C Hamano
2016-09-29 16:49:41 -07:00
2 changed files with 47 additions and 3 deletions

View File

@ -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"