From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Oct 2010 03:20:09 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~176
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/38a18873b21f6f2eebedc65aff2249fd6ec2168c?hp=-c

Merge branch 'maint'

* maint:
Better advice on using topic branches for kernel development
Documentation: update implicit "--no-index" behavior in "git diff"
Documentation: expand 'git diff' SEE ALSO section
Documentation: diff can compare blobs
Documentation: gitrevisions is in section 7
shell portability: no "export VAR=VAL"
CodingGuidelines: reword parameter expansion section
Documentation: update-index: -z applies also to --index-info
Documentation: No argument of ALLOC_GROW should have side-effects
---

38a18873b21f6f2eebedc65aff2249fd6ec2168c
diff --combined Documentation/git-fast-import.txt
index 90a46665c9,2c6ad5b2f3..5d0c245e38
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@@ -439,7 -439,7 +439,7 @@@ Marks must be declared (via `mark`) bef
  * A complete 40 byte or abbreviated commit SHA-1 in hex.
  
  * Any valid Git SHA-1 expression that resolves to a commit.  See
-   ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[1] for details.
+   ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details.
  
  The special case of restarting an incremental import from the
  current branch value should be written as:
@@@ -524,9 -524,6 +524,9 @@@ start with double quote (`"`)
  If an `LF` or double quote must be encoded into `<path>` shell-style
  quoting should be used, e.g. `"path/with\n and \" in it"`.
  
 +Additionally, in `040000` mode, `<path>` may also be an empty string
 +(`""`) to specify the root of the tree.
 +
  The value of `<path>` must be in canonical form. That is it must not:
  
  * contain an empty directory component (e.g. `foo//bar` is invalid),
diff --combined Documentation/git-format-patch.txt
index df77474c29,a00b783fe5..9dcafc6d44
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@@ -39,7 -39,7 +39,7 @@@ There are two ways to specify which com
     that leads to the <since> to be output.
  
  2. Generic <revision range> expression (see "SPECIFYING
-    REVISIONS" section in linkgit:gitrevisions[1]) means the
+    REVISIONS" section in linkgit:gitrevisions[7]) means the
     commits in the specified range.
  
  The first rule takes precedence in the case of a single <commit>.  To
@@@ -74,7 -74,7 +74,7 @@@ OPTION
  include::diff-options.txt[]
  
  -<n>::
 -	Limits the number of patches to prepare.
 +	Prepare patches from the topmost <n> commits.
  
  -o <dir>::
  --output-directory <dir>::
diff --combined git-am.sh
index 9317b38935,5f249485df..10436dcad5
--- a/git-am.sh
+++ b/git-am.sh
@@@ -137,7 -137,7 +137,7 @@@ It does not apply to blobs recorded in 
      export GITHEAD_$his_tree
      if test -n "$GIT_QUIET"
      then
- 	    export GIT_MERGE_VERBOSITY=0
+ 	    GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
      fi
      git-merge-recursive $orig_tree -- HEAD $his_tree || {
  	    git rerere $allow_rerere_autoupdate
@@@ -444,12 -444,12 +444,12 @@@ els
  				set x
  				first=
  			}
 -			case "$arg" in
 -			/*)
 -				set "$@" "$arg" ;;
 -			*)
 -				set "$@" "$prefix$arg" ;;
 -			esac
 +			if is_absolute_path "$arg"
 +			then
 +				set "$@" "$arg"
 +			else
 +				set "$@" "$prefix$arg"
 +			fi
  		done
  		shift
  	fi
diff --combined t/t5560-http-backend-noserver.sh
index 406432e7a5,94f9d2e8e0..0ad7ce07c4
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@@ -5,17 -5,16 +5,17 @@@ test_description='test git-http-backend
  
  HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
  
 +test_have_prereq MINGW && export GREP_OPTIONS=-U
 +
  run_backend() {
  	echo "$2" |
  	QUERY_STRING="${1#*\?}" \
 -	GIT_PROJECT_ROOT="$HTTPD_DOCUMENT_ROOT_PATH" \
 -	PATH_INFO="${1%%\?*}" \
 +	PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%\?*}" \
  	git http-backend >act.out 2>act.err
  }
  
  GET() {
- 	export REQUEST_METHOD="GET" &&
+ 	REQUEST_METHOD="GET" && export REQUEST_METHOD &&
  	run_backend "/repo.git/$1" &&
  	unset REQUEST_METHOD &&
  	if ! grep "Status" act.out >act
@@@ -27,8 -26,8 +27,8 @@@
  }
  
  POST() {
- 	export REQUEST_METHOD="POST" &&
- 	export CONTENT_TYPE="application/x-$1-request" &&
+ 	REQUEST_METHOD="POST" && export REQUEST_METHOD &&
+ 	CONTENT_TYPE="application/x-$1-request" && export CONTENT_TYPE &&
  	run_backend "/repo.git/$1" "$2" &&
  	unset REQUEST_METHOD &&
  	unset CONTENT_TYPE &&
@@@ -47,7 -46,7 +47,7 @@@ log_div() 
  . "$TEST_DIRECTORY"/t556x_common
  
  expect_aliased() {
- 	export REQUEST_METHOD="GET" &&
+ 	REQUEST_METHOD="GET" && export REQUEST_METHOD &&
  	if test $1 = 0; then
  		run_backend "$2"
  	else