diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-01 20:10:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-01 20:10:42 (GMT) |
| commit | 0305b636542c8c137ed7c82fee90db8d3621118c (patch) | |
| tree | 3a2a5e7a2b814b2f96c5edd681768706b9b3a048 /git-svn.perl | |
| parent | cd5ada993d6a992eaed1c416f9a2ed6ba9c4cb6d (diff) | |
| parent | 9489d0f197185d584294aa99a09a1b3c5ebb25e0 (diff) | |
| download | git-0305b636542c8c137ed7c82fee90db8d3621118c.zip git-0305b636542c8c137ed7c82fee90db8d3621118c.tar.gz git-0305b636542c8c137ed7c82fee90db8d3621118c.tar.bz2 | |
Merge branch 'ei/worktree+filter'
* ei/worktree+filter:
filter-branch: always export GIT_DIR if it is set
setup_git_directory: fix segfault if repository is found in cwd
test GIT_WORK_TREE
extend rev-parse test for --is-inside-work-tree
Use new semantics of is_bare/inside_git_dir/inside_work_tree
introduce GIT_WORK_TREE to specify the work tree
test git rev-parse
rev-parse: introduce --is-bare-repository
rev-parse: document --is-inside-git-dir
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index 98687f5..03d5e2d 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -596,8 +596,7 @@ sub post_fetch_checkout { my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index"; return if -f $index; - chomp(my $bare = `git config --bool --get core.bare`); - return if $bare eq 'true'; + return if command_oneline(qw/rev-parse --is-inside-work-tree/) eq 'false'; return if command_oneline(qw/rev-parse --is-inside-git-dir/) eq 'true'; command_noisy(qw/read-tree -m -u -v HEAD HEAD/); print STDERR "Checked out HEAD:\n ", |