From: Richard Hartmann <richih@debian.org>
Date: Tue, 22 Dec 2015 20:47:53 +0000 (+0100)
Subject: Merge branch 'fix/support_old_git'
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/6e5118a290be0dc24b919e8dc249aa9d763cd8b6?ds=sidebyside;hp=-c

Merge branch 'fix/support_old_git'
---

6e5118a290be0dc24b919e8dc249aa9d763cd8b6
diff --combined vcsh
index 06f6c33,98dd71e..98e0acd
--- a/vcsh
+++ b/vcsh
@@@ -106,16 -106,13 +106,16 @@@ help() 
     commit               Commit in all repositories
     delete <repo>        Delete an existing repository
     enter <repo>         Enter repository; spawn new instance of \$SHELL
 +   foreach [<-g>]
 +     <git command>      Execute a command for every repository
     help                 Display this help text
     init <repo>          Initialize a new repository
     list                 List all repositories
     list-tracked \\
          [<repo>]        List all files tracked all or one repositories
     list-untracked \\
 -        [<-r>] [<repo>] List all files not tracked by all or one repositories
 +        [<-a>] [<-r>]
 +        [<repo>]        List all files not tracked by all or one repositories
     pull                 Pull from all vcsh remotes
     push                 Push to vcsh remotes
     rename <repo> \\
@@@ -162,7 -159,12 +162,12 @@@ clone() 
    You should add files to your new repository."
  		exit
  	fi
- 	git fetch origin "$VCSH_BRANCH"
+ 	GIT_VERSION_MAJOR=$(git --version | sed -n 's/.* \([0-9]\)\..*/\1/p' )
+ 	if [ 1 -lt "$GIT_VERSION_MAJOR" ];then
+ 		git fetch origin "$VCSH_BRANCH"
+ 	else
+ 		git fetch origin
+ 	fi
  	hook pre-merge
  	git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do
  		[ -e "$object" ] &&
@@@ -218,27 -220,6 +223,27 @@@ enter() 
  	hook post-enter
  }
  
 +foreach() {
 +	hook pre-foreach
 +
 +	# We default to prefixing `git` to all commands passed to foreach, but
 +	# allow running in general context with -g
 +	command_prefix=git
 +	while getopts "g" flag; do
 +		if [ x"$1" = x'-g' ]; then
 +			unset command_prefix
 +		fi
 +		shift 1
 +	done
 +	for VCSH_REPO_NAME in $(list); do
 +		echo "$VCSH_REPO_NAME:"
 +		GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
 +		use
 +		$command_prefix "$@"
 +	done
 +	hook post-foreach
 +}
 +
  git_dir_exists() {
  	[ -d "$GIT_DIR" ] || fatal "no repository found for '$VCSH_REPO_NAME'" 12
  }
@@@ -299,13 -280,10 +304,13 @@@ list_untracked() 
  	temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
  
  	# Hack in support for `vcsh list-untracked -r`...
 +	exclude_standard_opt='--exclude-standard'
  	directory_opt="--directory"
  	shift 1
 -	while getopts "r" flag; do
 -		if [ x"$1" = x'-r' ]; then
 +	while getopts "ar" flag; do
 +		if [ x"$1" = x'-a' ]; then
 +			unset exclude_standard_opt
 +		elif [ x"$1" = x'-r' ]; then
  			unset directory_opt
  		fi
  		shift 1
@@@ -328,7 -306,7 +333,7 @@@
  
  list_untracked_helper() {
  	export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
 -	git ls-files --others "$directory_opt" | (
 +	git ls-files --others $exclude_standard_opt "$directory_opt" | (
  		while read line; do
  			echo "$line"
  			directory_component=${line%%/*}
@@@ -581,9 -559,6 +586,9 @@@ elif [ x"$VCSH_COMMAND" = x'delete' 
  	[ x"$VCSH_COMMAND" = x'rename' ] && { VCSH_REPO_NAME_NEW=$3; export VCSH_REPO_NAME_NEW;
  	                                      GIT_DIR_NEW=$VCSH_REPO_D/$VCSH_REPO_NAME_NEW.git; export GIT_DIR_NEW; }
  	[ x"$VCSH_COMMAND" = x'run' ]    && shift 2
 +elif [ x"$VCSH_COMMAND" = x'foreach' ]; then
 +	[ -z "$2" ] && fatal "$VCSH_COMMAND: please specify a command" 1
 +	shift 1
  elif [ x"$VCSH_COMMAND" = x'commit' ] ||
       [ x"$VCSH_COMMAND" = x'list'   ] ||
       [ x"$VCSH_COMMAND" = x'list-tracked' ] ||