From: Richard Hartmann <RichiH@users.noreply.github.com>
Date: Sun, 21 Feb 2016 12:31:24 +0000 (+0100)
Subject: Merge pull request #196 from jotrk/master
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/e4f4ecf2450ee5cbad7698e81f9bf4e2d3a26bd0?hp=5f7069911b8c2f76bdd098a21ffe3dc3f4c0cb5a

Merge pull request #196 from jotrk/master

Fix write_gitignore for git version >= 2.7
---

diff --git a/vcsh b/vcsh
index 98e0acd..d4e1ba0 100755
--- a/vcsh
+++ b/vcsh
@@ -476,14 +476,21 @@ write_gitignore() {
 
 	use
 	cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
+	local GIT_VERSION=$(git --version)
+	local GIT_VERSION_MAJOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\..*/\1/p')
+	local GIT_VERSION_MINOR=$(echo $GIT_VERSION | sed -n 's/.* \([0-9]\)\.\([0-9]\)\..*/\2/p')
 	OLDIFS=$IFS
 	IFS=$(printf '\n\t')
 	gitignores=$(for file in $(git ls-files); do
-		while true; do
-			echo "$file"; new=${file%/*}
-			[ x"$file" = x"$new" ] && break
-			file=$new
-		done;
+		if [ $GIT_VERSION_MAJOR -ge 2 -a $GIT_VERSION_MINOR -ge 7 ]; then
+			echo "$file";
+		else
+			while true; do
+				echo "$file"; new=${file%/*}
+				[ x"$file" = x"$new" ] && break
+				file=$new
+			done;
+		fi
 	done | sort -u)
 
 	# Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files