From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 02:03:29 +0000 (-0800)
Subject: Merge branch 'rv/maint-index-commit' into maint
X-Git-Tag: v1.5.3.7~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/788ea12d43605945cbfe74b4dadda8f75c23a411?hp=-c

Merge branch 'rv/maint-index-commit' into maint

* rv/maint-index-commit:
Make GIT_INDEX_FILE apply to git-commit
---

788ea12d43605945cbfe74b4dadda8f75c23a411
diff --combined git-commit.sh
index 5e3908f2cb,fdaa019e8f..1c0c6b9e41
--- a/git-commit.sh
+++ b/git-commit.sh
@@@ -26,7 -26,7 +26,7 @@@ refuse_partial () 
  }
  
  TMP_INDEX=
- THIS_INDEX="$GIT_DIR/index"
+ THIS_INDEX="${GIT_INDEX_FILE:-$GIT_DIR/index}"
  NEXT_INDEX="$GIT_DIR/next-index$$"
  rm -f "$NEXT_INDEX"
  save_index () {
@@@ -322,9 -322,9 +322,9 @@@ unset onl
  case "$all,$interactive,$also,$#" in
  *t,*t,*)
  	die "Cannot use -a, --interactive or -i at the same time." ;;
 -t,,[1-9]*)
 +t,,,[1-9]*)
  	die "Paths with -a does not make sense." ;;
 -,t,[1-9]*)
 +,t,,[1-9]*)
  	die "Paths with --interactive does not make sense." ;;
  ,,t,0)
  	die "No paths with -i does not make sense." ;;