From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2019 06:05:29 +0000 (-0800)
Subject: Merge branch 'ss/describe-dirty-in-the-right-directory'
X-Git-Tag: v2.21.0-rc0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1e19004e11dcbc0ceebd92c425ceb1770e52d0b;p=thirdparty%2Fgit.git

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
---

a1e19004e11dcbc0ceebd92c425ceb1770e52d0b
diff --cc builtin/describe.c
index 02ec56417a,d281dff2b3..1409cedce2
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@@ -630,7 -617,8 +630,8 @@@ int cmd_describe(int argc, const char *
  			struct argv_array args = ARGV_ARRAY_INIT;
  			int fd, result;
  
+ 			setup_work_tree();
 -			read_cache_preload(NULL);
 +			read_cache();
  			refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED,
  				      NULL, NULL, NULL);
  			fd = hold_locked_index(&index_lock, 0);