Skip to content

Commit

Permalink
describe: Refresh the index when run with --dirty
Browse files Browse the repository at this point in the history
When running git describe --dirty the index should be refreshed.  Previously
the cached index would cause describe to think that the index was dirty when,
in reality, it was just stale.

The issue was exposed by python setuptools which hardlinks files into another
directory when building a distribution.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Allan Caffee authored and Junio C Hamano committed Sep 23, 2011
1 parent 84b0514 commit 85b3c75
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions builtin/describe.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,21 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
die(_("No names found, cannot describe anything."));

if (argc == 0) {
if (dirty && !cmd_diff_index(ARRAY_SIZE(diff_index_args) - 1, diff_index_args, prefix))
dirty = NULL;
if (dirty) {
static struct lock_file index_lock;
int fd;

read_cache_preload(NULL);
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED,
NULL, NULL, NULL);
fd = hold_locked_index(&index_lock, 0);
if (0 <= fd)
update_index_if_able(&the_index, &index_lock);

if (!cmd_diff_index(ARRAY_SIZE(diff_index_args) - 1,
diff_index_args, prefix))
dirty = NULL;
}
describe("HEAD", 1);
} else if (dirty) {
die(_("--dirty is incompatible with committishes"));
Expand Down

0 comments on commit 85b3c75

Please sign in to comment.