From: Richard Hartmann Date: Tue, 25 Feb 2014 14:33:55 +0000 (+0100) Subject: Merge branch 'feature/IFS' X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/7d9eb8c67860581c87961990e257267f028175eb?ds=sidebyside;hp=-c Merge branch 'feature/IFS' --- 7d9eb8c67860581c87961990e257267f028175eb diff --combined vcsh index b0bf758,8532a29..029a2b2 --- a/vcsh +++ b/vcsh @@@ -364,6 -364,8 +364,8 @@@ write_gitignore() use cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11 + OLDIFS="$IFS" + IFS=$(printf '\n\t') gitignores=$(for file in $(git ls-files); do while true; do echo $file; new="${file%/*}" @@@ -384,6 -386,7 +386,7 @@@ { echo "$gitignore/*" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; } fi done + IFS="$OLDIFS" if diff -N "$tempfile" "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then rm -f "$tempfile" || error "could not delete '$tempfile'" exit @@@ -397,7 -400,7 +400,7 @@@ fatal "could not move '$tempfile' to '$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME'" 53 } -debug `git version` +debug $(git version) if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xnone' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive' ]; then fatal "'\$VCSH_GITIGNORE' must equal 'exact', 'none', or 'recursive'" 1