From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Sep 2016 23:49:41 +0000 (-0700)
Subject: Merge branch 'jk/rebase-i-drop-ident-check' into maint
X-Git-Tag: v2.10.1~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e25e6f3947403ed87cc016b7dc2c0692a5b6c2d2?hp=-c

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

e25e6f3947403ed87cc016b7dc2c0692a5b6c2d2
diff --combined git-rebase--interactive.sh
index 6fd6d4e5f6,f0f4777da1..5e474e4a85
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -121,7 -121,7 +121,7 @@@ mark_action_done () 
  	sed -e 1q < "$todo" >> "$done"
  	sed -e 1d < "$todo" >> "$todo".new
  	mv -f "$todo".new "$todo"
 -	new_count=$(git stripspace --strip-comments <"$done" | wc -l)
 +	new_count=$(( $(git stripspace --strip-comments <"$done" | wc -l) ))
  	echo $new_count >"$msgnum"
  	total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l)))
  	echo $total >"$end"
@@@ -404,12 -404,51 +404,12 @@@ pick_one_preserving_merges () 
  
  this_nth_commit_message () {
  	n=$1
 -	case "$n" in
 -	1) gettext "This is the 1st commit message:";;
 -	2) gettext "This is the 2nd commit message:";;
 -	3) gettext "This is the 3rd commit message:";;
 -	4) gettext "This is the 4th commit message:";;
 -	5) gettext "This is the 5th commit message:";;
 -	6) gettext "This is the 6th commit message:";;
 -	7) gettext "This is the 7th commit message:";;
 -	8) gettext "This is the 8th commit message:";;
 -	9) gettext "This is the 9th commit message:";;
 -	10) gettext "This is the 10th commit message:";;
 -	# TRANSLATORS: if the language you are translating into
 -	# doesn't allow you to compose a sentence in this fashion,
 -	# consider translating as if this and the following few strings
 -	# were "This is the commit message ${n}:"
 -	*1[0-9]|*[04-9]) eval_gettext "This is the \${n}th commit message:";;
 -	*1) eval_gettext "This is the \${n}st commit message:";;
 -	*2) eval_gettext "This is the \${n}nd commit message:";;
 -	*3) eval_gettext "This is the \${n}rd commit message:";;
 -	*) eval_gettext "This is the commit message \${n}:";;
 -	esac
 +	eval_gettext "This is the commit message #\${n}:"
  }
 +
  skip_nth_commit_message () {
  	n=$1
 -	case "$n" in
 -	1) gettext "The 1st commit message will be skipped:";;
 -	2) gettext "The 2nd commit message will be skipped:";;
 -	3) gettext "The 3rd commit message will be skipped:";;
 -	4) gettext "The 4th commit message will be skipped:";;
 -	5) gettext "The 5th commit message will be skipped:";;
 -	6) gettext "The 6th commit message will be skipped:";;
 -	7) gettext "The 7th commit message will be skipped:";;
 -	8) gettext "The 8th commit message will be skipped:";;
 -	9) gettext "The 9th commit message will be skipped:";;
 -	10) gettext "The 10th commit message will be skipped:";;
 -	# TRANSLATORS: if the language you are translating into
 -	# doesn't allow you to compose a sentence in this fashion,
 -	# consider translating as if this and the following few strings
 -	# were "The commit message ${n} will be skipped:"
 -	*1[0-9]|*[04-9]) eval_gettext "The \${n}th commit message will be skipped:";;
 -	*1) eval_gettext "The \${n}st commit message will be skipped:";;
 -	*2) eval_gettext "The \${n}nd commit message will be skipped:";;
 -	*3) eval_gettext "The \${n}rd commit message will be skipped:";;
 -	*) eval_gettext "The commit message \${n} will be skipped:";;
 -	esac
 +	eval_gettext "The commit message #\${n} will be skipped:"
  }
  
  update_squash_messages () {
@@@ -1082,7 -1121,7 +1082,7 @@@ If they are meant to go into a new comm
  
    git commit \$gpg_sign_opt_quoted
  
 -In both case, once you're done, continue with:
 +In both cases, once you're done, continue with:
  
    git rebase --continue
  ")"
@@@ -1141,9 -1180,6 +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"