From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2011 19:33:36 +0000 (-0700)
Subject: Merge branch 'oa/pull-reflog'
X-Git-Tag: v1.7.7-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1421fd9df4f1e3ed232bd1c683c6e264a464a41e?hp=-c

Merge branch 'oa/pull-reflog'

* oa/pull-reflog:
pull: remove extra space from reflog message

Conflicts:
git-pull.sh
---

1421fd9df4f1e3ed232bd1c683c6e264a464a41e
diff --combined git-pull.sh
index a10b1290bc,28441aca8a..eec3a07f0f
--- a/git-pull.sh
+++ b/git-pull.sh
@@@ -9,8 -9,7 +9,8 @@@ LONG_USAGE='Fetch one or more remote re
  SUBDIRECTORY_OK=Yes
  OPTIONS_SPEC=
  . git-sh-setup
 +. git-sh-i18n
- set_reflog_action "pull $*"
+ set_reflog_action "pull${1+ $*}"
  require_work_tree
  cd_to_toplevel
  
@@@ -18,20 -17,20 +18,20 @@@
  die_conflict () {
      git diff-index --cached --name-status -r --ignore-submodules HEAD --
      if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
 -	die "Pull is not possible because you have unmerged files.
 +	die "$(gettext "Pull is not possible because you have unmerged files.
  Please, fix them up in the work tree, and then use 'git add/rm <file>'
 -as appropriate to mark resolution, or use 'git commit -a'."
 +as appropriate to mark resolution, or use 'git commit -a'.")"
      else
 -	die "Pull is not possible because you have unmerged files."
 +	die "$(gettext "Pull is not possible because you have unmerged files.")"
      fi
  }
  
  die_merge () {
      if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
 -	die "You have not concluded your merge (MERGE_HEAD exists).
 -Please, commit your changes before you can merge."
 +	die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
 +Please, commit your changes before you can merge.")"
      else
 -	die "You have not concluded your merge (MERGE_HEAD exists)."
 +	die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
      fi
  }
  
@@@ -186,7 -185,7 +186,7 @@@ test true = "$rebase" && 
  		# On an unborn branch
  		if test -f "$GIT_DIR/index"
  		then
 -			die "updating an unborn branch with changes added to the index"
 +			die "$(gettext "updating an unborn branch with changes added to the index")"
  		fi
  	else
  		require_clean_work_tree "pull with rebase" "Please commit or stash them."
@@@ -217,20 -216,17 +217,20 @@@ the
  	# $orig_head commit, but we are merging into $curr_head.
  	# First update the working tree to match $curr_head.
  
 -	echo >&2 "Warning: fetch updated the current branch head."
 -	echo >&2 "Warning: fast-forwarding your working tree from"
 -	echo >&2 "Warning: commit $orig_head."
 +	(
 +		eval_gettext "Warning: fetch updated the current branch head.
 +Warning: fast-forwarding your working tree from
 +Warning: commit \$orig_head." &&
 +		echo
 +	) >&2
  	git update-index -q --refresh
  	git read-tree -u -m "$orig_head" "$curr_head" ||
 -		die 'Cannot fast-forward your working tree.
 +		die "$(eval_gettext "Cannot fast-forward your working tree.
  After making sure that you saved anything precious from
 -$ git diff '$orig_head'
 +$ git diff \$orig_head
  output, run
  $ git reset --hard
 -to recover.'
 +to recover.")"
  
  fi
  
@@@ -245,11 -241,11 +245,11 @@@ case "$merge_head" i
  ?*' '?*)
  	if test -z "$orig_head"
  	then
 -		die "Cannot merge multiple branches into empty head"
 +		die "$(gettext "Cannot merge multiple branches into empty head")"
  	fi
  	if test true = "$rebase"
  	then
 -		die "Cannot rebase onto multiple branches"
 +		die "$(gettext "Cannot rebase onto multiple branches")"
  	fi
  	;;
  esac