Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rv/maint-index-commit' into maint
author
Junio C Hamano
<gitster@pobox.com>
Sun, 25 Nov 2007 02:03:29 +0000
(18:03 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 25 Nov 2007 02:03:29 +0000
(18:03 -0800)
* rv/maint-index-commit:
Make GIT_INDEX_FILE apply to git-commit
1
2
git-commit.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
be4b37b
859a4db
)
diff --combined
git-commit.sh
index 5e3908f2cbf5cf96b4f5c3b07d5178b3e2321b58,fdaa019e8f0bdcb222043352068ca2ba6f064cf9..1c0c6b9e418014cd326d8373f54c38286d2e1239
---
1
/
git-commit.sh
---
2
/
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." ;;