[PATCH 14/28] make do_reupdate void
Makes do_reupdate void and cleans up function calls.
David
Signed-off-by: David Rientjes <rientjes@google.com>
---
builtin-update-index.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/builtin-update-index.c b/builtin-update-index.c
index d2556f3..010adcf 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -433,8 +433,8 @@ static int do_unresolve(int ac, const ch
return err;
}
-static int do_reupdate(int ac, const char **av,
- const char *prefix, int prefix_length)
+static void do_reupdate(int ac, const char **av,
+ const char *prefix, int prefix_length)
{
/* Read HEAD and run update-index on paths that are
* merged and already different between index and HEAD.
@@ -473,7 +473,6 @@ static int do_reupdate(int ac, const cha
if (save_nr != active_nr)
goto redo;
}
- return 0;
}
int cmd_update_index(int argc, const char **argv, const char *prefix)
@@ -596,10 +595,8 @@ int cmd_update_index(int argc, const cha
goto finish;
}
if (!strcmp(path, "--again")) {
- has_errors = do_reupdate(argc - i, argv + i,
- prefix, prefix_length);
- if (has_errors)
- active_cache_changed = 0;
+ do_reupdate(argc - i, argv + i, prefix,
+ prefix_length);
goto finish;
}
if (!strcmp(path, "--ignore-missing")) {
--
1.4.2.g89bb-dirty