kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ac/describe-dirty-refresh' 

* ac/describe-dirty-refresh:
  describe: Refresh the index when run with --dirty
maint
Junio C Hamano 2011-08-25 16:00:24 -07:00
parent e11fa9a460 bb571486ae
commit 22f6578975
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/describe.c
View File

@ -462,8 +462,21 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
die(_("No names found, cannot describe anything.")); die(_("No names found, cannot describe anything."));


if (argc == 0) { if (argc == 0) {
if (dirty && !cmd_diff_index(ARRAY_SIZE(diff_index_args) - 1, diff_index_args, prefix)) if (dirty) {
dirty = NULL; 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); describe("HEAD", 1);
} else if (dirty) { } else if (dirty) {
die(_("--dirty is incompatible with committishes")); die(_("--dirty is incompatible with committishes"));