]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ss/describe-dirty-in-the-right-directory'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:29 +0000 (22:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:29 +0000 (22:05 -0800)
commita1e19004e11dcbc0ceebd92c425ceb1770e52d0b
treed3d2ab651aaa2766c84b7b971d78ec47ea2403d2
parentd219b7f3f97ddbea883af228b9f2d845c9c1d390
parentc801170b0cbc3fdd44331a53c2b7649687625680
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
builtin/describe.c
t/t6120-describe.sh