diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
| commit | 0d9d89f61c58f72d96585a61defb0634873c38ac (patch) | |
| tree | fcb314481bb669dcf1f33ba3934786c1dcc51b12 /builtin-ls-files.c | |
| parent | 14965530727e967806a5c62d7c826104baaec3c0 (diff) | |
| parent | c238dad407aec1ccf6e364f9c95e10e7f84eac8f (diff) | |
| download | git-0d9d89f61c58f72d96585a61defb0634873c38ac.tar.gz | |
Merge master into aw/mirror-push
Diffstat (limited to 'builtin-ls-files.c')
| -rw-r--r-- | builtin-ls-files.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index b70da1863b..e0b856f432 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -525,11 +525,8 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) break; } - if (require_work_tree && !is_inside_work_tree()) { - const char *work_tree = get_git_work_tree(); - if (!work_tree || chdir(work_tree)) - die("This operation must be run in a work tree"); - } + if (require_work_tree && !is_inside_work_tree()) + setup_work_tree(); pathspec = get_pathspec(prefix, argv + i); |