diff options
| author |  Allan Caffee <allan.caffee@gmail.com> | 2011-07-31 21:52:41 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-11 13:03:35 -0700 |
| commit | bb571486ae93d02746c4bcc8032bde306f6d399a (patch) | |
| tree | 86990223d8d82b7b09ba05f92475b70a3e41a19a | |
| parent | git-p4: commit time should be most recent p4 change time (diff) | |
| download | tgif-bb571486ae93d02746c4bcc8032bde306f6d399a.tar.xz | |
describe: Refresh the index when run with --dirty
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>
| -rw-r--r-- | builtin/describe.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 66fc291c8a..9f63067f50 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -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")); |