diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-01 13:10:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-01 13:10:42 -0700 |
| commit | 0305b636542c8c137ed7c82fee90db8d3621118c (patch) | |
| tree | 3a2a5e7a2b814b2f96c5edd681768706b9b3a048 /builtin-ls-files.c | |
| parent | cd5ada993d6a992eaed1c416f9a2ed6ba9c4cb6d (diff) | |
| parent | 9489d0f197185d584294aa99a09a1b3c5ebb25e0 (diff) | |
| download | git-0305b636542c8c137ed7c82fee90db8d3621118c.tar.gz git-0305b636542c8c137ed7c82fee90db8d3621118c.tar.xz | |
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 'builtin-ls-files.c')
| -rw-r--r-- | builtin-ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index 5398a4141..61577ea13 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -470,7 +470,7 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) } if (require_work_tree && - (is_bare_repository() || is_inside_git_dir())) + (!is_inside_work_tree() || is_inside_git_dir())) die("This operation must be run in a work tree"); pathspec = get_pathspec(prefix, argv + i); |