diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:29 -0800 |
| commit | a1e19004e11dcbc0ceebd92c425ceb1770e52d0b (patch) | |
| tree | d3d2ab651aaa2766c84b7b971d78ec47ea2403d2 /builtin | |
| parent | Merge branch 'sg/travis-osx-brew-breakage-workaround' (diff) | |
| parent | t6120: test for describe with a bare repository (diff) | |
| download | tgif-a1e19004e11dcbc0ceebd92c425ceb1770e52d0b.tar.xz | |
Merge branch 'ss/describe-dirty-in-the-right-directory'
"git --work-tree=$there --git-dir=$here describe --dirty" did not
work correctly as it did not pay attention to the location of the
worktree specified by the user by mistake, which has been
corrected.
* ss/describe-dirty-in-the-right-directory:
t6120: test for describe with a bare repository
describe: setup working tree for --dirty
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/describe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 02ec56417a..1409cedce2 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -630,6 +630,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix) struct argv_array args = ARGV_ARRAY_INIT; int fd, result; + setup_work_tree(); read_cache(); refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL); |