From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 18 Aug 2011 00:35:50 +0000 (-0700)
Subject: Merge branch 'js/sh-style'
X-Git-Tag: v1.7.7-rc0~27
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/146120588046e97e52367cad658b42accffa098e?ds=inline;hp=-c

Merge branch 'js/sh-style'

* js/sh-style:
filter-branch.sh: de-dent usage string
misc-sh: fix up whitespace in some other .sh files.
---

146120588046e97e52367cad658b42accffa098e
diff --combined git-filter-branch.sh
index 6b5f2251b6,71d072baaf..804a7f4bc9
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@@ -12,7 -12,7 +12,7 @@@
  
  functions=$(cat << \EOF
  warn () {
-         echo "$*" >&2
+ 	echo "$*" >&2
  }
  
  map()
@@@ -98,11 -98,11 +98,11 @@@ set_ident () 
  }
  
  USAGE="[--env-filter <command>] [--tree-filter <command>]
-             [--index-filter <command>] [--parent-filter <command>]
-             [--msg-filter <command>] [--commit-filter <command>]
-             [--tag-name-filter <command>] [--subdirectory-filter <directory>]
-             [--original <namespace>] [-d <directory>] [-f | --force]
-             [<rev-list options>...]"
+ 	[--index-filter <command>] [--parent-filter <command>]
+ 	[--msg-filter <command>] [--commit-filter <command>]
+ 	[--tag-name-filter <command>] [--subdirectory-filter <directory>]
+ 	[--original <namespace>] [-d <directory>] [-f | --force]
+ 	[<rev-list options>...]"
  
  OPTIONS_SPEC=
  . git-sh-setup
@@@ -363,7 -363,7 +363,7 @@@ while read commit parents; d
  	sed -e '1,/^$/d' <../commit | \
  		eval "$filter_msg" > ../message ||
  			die "msg filter failed: $filter_msg"
 -	@SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
 +	workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
  		$(git write-tree) $parentstr < ../message > ../map/$commit ||
  			die "could not write rewritten commit"
  done <../revs