From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:26:48 +0000 (-0800)
Subject: Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-login'
X-Git-Tag: v2.3.0-rc0~71
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8e606f97f8dee35f839b50900db8ab98fe189b3c?hp=-c

Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-login'

* dw/shell-basename-dashdash-before-stripping-leading-dash-from-login:
git-sh-setup.sh: use dashdash with basename call
---

8e606f97f8dee35f839b50900db8ab98fe189b3c
diff --combined git-sh-setup.sh
index d968760139,5cdae338b8..c42c6e6365
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@@ -81,7 -81,7 +81,7 @@@ if test -n "$OPTIONS_SPEC"; the
  		echo exit $?
  	)"
  else
- 	dashless=$(basename "$0" | sed -e 's/-/ /')
+ 	dashless=$(basename -- "$0" | sed -e 's/-/ /')
  	usage() {
  		die "usage: $dashless $USAGE"
  	}
@@@ -330,7 -330,8 +330,7 @@@ esa
  
  # Make sure we are in a valid repository of a vintage we understand,
  # if we require to be in a git repository.
 -if test -z "$NONGIT_OK"
 -then
 +git_dir_init () {
  	GIT_DIR=$(git rev-parse --git-dir) || exit
  	if [ -z "$SUBDIRECTORY_OK" ]
  	then
@@@ -345,11 -346,6 +345,11 @@@
  		exit 1
  	}
  	: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
 +}
 +
 +if test -z "$NONGIT_OK"
 +then
 +	git_dir_init
  fi
  
  peel_committish () {