undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Makefile: reenable install with NO_CURL
  completion: --set-upstream option for git-branch
  get_cwd_relative(): do not misinterpret suffix as subdirectory
This commit is contained in:
Junio C Hamano 2010-05-28 16:59:42 -07:00
commit 81fa024cd8
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -2008,12 +2008,13 @@ endif
ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
done; } && \ done; } && \
{ test x"$(REMOTE_CURL_ALIASES)" = x || \
{ for p in $(REMOTE_CURL_ALIASES); do \ { for p in $(REMOTE_CURL_ALIASES); do \
$(RM) "$$execdir/$$p" && \ $(RM) "$$execdir/$$p" && \
ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \ cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
done; } && \ done; } ; } && \
./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X" ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
install-gitweb: install-gitweb:

1
contrib/completion/git-completion.bash
View File

@ -797,6 +797,7 @@ _git_branch ()
__gitcomp " __gitcomp "
--color --no-color --verbose --abbrev= --no-abbrev --color --no-color --verbose --abbrev= --no-abbrev
--track --no-track --contains --merged --no-merged --track --no-track --contains --merged --no-merged
--set-upstream
" "
;; ;;
*) *)

9
dir.c
View File

@ -958,9 +958,14 @@ char *get_relative_cwd(char *buffer, int size, const char *dir)
} }
if (*dir) if (*dir)
return NULL; return NULL;
if (*cwd == '/') switch (*cwd) {
return cwd + 1; case '\0':
return cwd; return cwd;
case '/':
return cwd + 1;
default:
return NULL;
}
} }
int is_inside_dir(const char *dir) int is_inside_dir(const char *dir)

12
t/t1501-worktree.sh
View File

@ -30,6 +30,7 @@ test_rev_parse() {
EMPTY_TREE=$(git write-tree) EMPTY_TREE=$(git write-tree)
mkdir -p work/sub/dir || exit 1 mkdir -p work/sub/dir || exit 1
mkdir -p work2 || exit 1
mv .git repo.git || exit 1 mv .git repo.git || exit 1
say "core.worktree = relative path" say "core.worktree = relative path"
@ -54,7 +55,9 @@ GIT_DIR=$(pwd)/repo.git
GIT_CONFIG=$GIT_DIR/config GIT_CONFIG=$GIT_DIR/config
git config core.worktree "$(pwd)/work" git config core.worktree "$(pwd)/work"
test_rev_parse 'outside' false false false test_rev_parse 'outside' false false false
cd work || exit 1 cd work2
test_rev_parse 'outside2' false false false
cd ../work || exit 1
test_rev_parse 'inside' false false true '' test_rev_parse 'inside' false false true ''
cd sub/dir || exit 1 cd sub/dir || exit 1
test_rev_parse 'subdirectory' false false true sub/dir/ test_rev_parse 'subdirectory' false false true sub/dir/
@ -67,7 +70,9 @@ git config core.worktree non-existent
GIT_WORK_TREE=work GIT_WORK_TREE=work
export GIT_WORK_TREE export GIT_WORK_TREE
test_rev_parse 'outside' false false false test_rev_parse 'outside' false false false
cd work || exit 1 cd work2
test_rev_parse 'outside' false false false
cd ../work || exit 1
GIT_WORK_TREE=. GIT_WORK_TREE=.
test_rev_parse 'inside' false false true '' test_rev_parse 'inside' false false true ''
cd sub/dir || exit 1 cd sub/dir || exit 1
@ -76,6 +81,7 @@ test_rev_parse 'subdirectory' false false true sub/dir/
cd ../../.. || exit 1 cd ../../.. || exit 1
mv work repo.git/work mv work repo.git/work
mv work2 repo.git/work2
say "GIT_WORK_TREE=absolute path, work tree below git dir" say "GIT_WORK_TREE=absolute path, work tree below git dir"
GIT_DIR=$(pwd)/repo.git GIT_DIR=$(pwd)/repo.git
@ -86,6 +92,8 @@ cd repo.git || exit 1
test_rev_parse 'in repo.git' false true false test_rev_parse 'in repo.git' false true false
cd objects || exit 1 cd objects || exit 1
test_rev_parse 'in repo.git/objects' false true false test_rev_parse 'in repo.git/objects' false true false
cd ../work2 || exit 1
test_rev_parse 'in repo.git/work2' false true false
cd ../work || exit 1 cd ../work || exit 1
test_rev_parse 'in repo.git/work' false true true '' test_rev_parse 'in repo.git/work' false true true ''
cd sub/dir || exit 1 cd sub/dir || exit 1