[PATCH/RFC/GSoC 08/17] rebase-common: let refresh_and_write_cache() take a flags argument

From: Paul Tan <pyokagan@gmail.com>
Date: Mar 12, 2016, 10:46 UTC
Message-ID: <1457779597-6918-9-git-send-email-pyokagan@gmail.com>
In-Reply-To: <1457779597-6918-1-git-send-email-pyokagan@gmail.com>

refresh_and_write_cache() is a handy function for refreshing the index and writing the resulting index back to the filesystem. However, it always calls refresh_cache() with REFRESH_QUIET. Allow callers to modify the behavior of refresh_cache() by allowing callers to pass a flags argument to refresh_cache().

Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
 builtin/am.c    | 2 +-
 rebase-common.c | 4 ++--
 rebase-common.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builtin/am.c b/builtin/am.c
index 504b604..5185719 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1815,7 +1815,7 @@ static void am_run(struct am_state *state, int resume)
 
 	unlink(am_path(state, "dirtyindex"));
 
-	refresh_and_write_cache();
+	refresh_and_write_cache(REFRESH_QUIET);
 
 	if (index_has_changes(&sb)) {
 		write_state_bool(state, "dirtyindex", 1);
diff --git a/rebase-common.c b/rebase-common.c
index b07e1f1..97b0687 100644
--- a/rebase-common.c
+++ b/rebase-common.c
@@ -5,12 +5,12 @@
 #include "refs.h"
 #include "lockfile.h"
 
-void refresh_and_write_cache(void)
+void refresh_and_write_cache(unsigned int flags)
 {
 	struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
 
 	hold_locked_index(lock_file, 1);
-	refresh_cache(REFRESH_QUIET);
+	refresh_cache(flags);
 	if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
 		die(_("unable to write index file"));
 }
diff --git a/rebase-common.h b/rebase-common.h
index 8620e8c..4586f03 100644
--- a/rebase-common.h
+++ b/rebase-common.h
@@ -4,7 +4,7 @@
 /**
  * Refresh and write index.
  */
-void refresh_and_write_cache(void);
+void refresh_and_write_cache(unsigned int);
 
 /* common rebase backend options */
 struct rebase_options {

-- 
2.7.0