mirror of
https://github.com/git/git.git
synced 2026-03-13 10:23:30 +01:00
Merge branch 'master' of git://repo.or.cz/alt-git
This commit is contained in:
@@ -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 () {
|
||||
@@ -282,9 +282,9 @@ unset only
|
||||
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." ;;
|
||||
|
||||
Reference in New Issue
Block a user