mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-29 21:37:53 +01:00
Code Activity

reset.c: inline update_index_refresh()

Browse source 
Now that there is only one caller left to the single-line method
update_index_refresh(), inline it.

Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin von Zweigbergk 2013-01-14 21:47:48 -08:00 committed by Junio C Hamano
parent 3bbf2f20f6
commit 7637df131e
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
builtin/reset.c
View file

@ -109,12 +109,6 @@ static void print_new_head_line(struct commit *commit)
printf("\n");
}
static void update_index_refresh(int flags)
{
refresh_index(&the_index, (flags), NULL, NULL,
_("Unstaged changes after reset:"));
}
static void update_index_from_diff(struct diff_queue_struct *q,
struct diff_options *opt, void *data)
{
@ -329,9 +323,11 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
die(_("Could not reset index file to revision '%s'."), rev);
}
if (reset_type == MIXED) /* Report what has not been updated. */
update_index_refresh(
quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
if (reset_type == MIXED) { /* Report what has not been updated. */
int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
refresh_index(&the_index, flags, NULL, NULL,
_("Unstaged changes after reset:"));
}
if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(lock))