[PATCH v2 16/19] reset.c: inline update_index_refresh()
From: Martin von Zweigbergk <hidden>
Date: 2016-06-15 22:55:46
Subsystem:
the rest · Maintainer:
Linus Torvalds
Now that there is only one caller left to the single-line method update_index_refresh(), inline it. Signed-off-by: Martin von Zweigbergk <redacted> --- builtin/reset.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index c316d9b..520c1a5 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c@@ -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))
--
1.8.1.1.454.gce43f05