From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Jun 2013 21:56:24 +0000 (-0700)
Subject: Merge branch 'dm/unbash-subtree'
X-Git-Tag: v1.8.4-rc0~217
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/779fd737d79a3e19a1aa420c33cf1195c7e20dd7?ds=inline;hp=-c

Merge branch 'dm/unbash-subtree'

It turns out that git-subtree script does not have to be run with
bash.

* dm/unbash-subtree:
contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
---

779fd737d79a3e19a1aa420c33cf1195c7e20dd7
diff --combined contrib/subtree/git-subtree.sh
index 10daa8b0eb,57013763ec..51ae932e5e
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@@ -1,4 -1,4 +1,4 @@@
- #!/bin/bash
+ #!/bin/sh
  #
  # git-subtree.sh: split/join git repositories in subdirectories of this one
  #
@@@ -715,8 -715,7 +715,8 @@@ cmd_push(
  	    repository=$1
  	    refspec=$2
  	    echo "git push using: " $repository $refspec
 -	    git push $repository $(git subtree split --prefix=$prefix):refs/heads/$refspec
 +	    localrev=$(git subtree split --prefix="$prefix") || die
 +	    git push $repository $localrev:refs/heads/$refspec
  	else
  	    die "'$dir' must already exist. Try 'git subtree add'."
  	fi