{"thread":{"id":"5263","subject":"[PATCH 14/28] make do_reupdate void","startedAt":"2006-08-14T20:31:16Z","lastAt":"2006-08-14T20:31:16Z","messageCount":1,"participants":["David Rientjes"],"isPatch":true,"patchVersion":1,"patchTotal":28},"messages":[{"id":"25294","messageId":"Pine.LNX.4.63.0608141330340.19383@chino.corp.google.com","threadId":"5263","inReplyTo":null,"subject":"[PATCH 14/28] make do_reupdate void","fromName":"David Rientjes","fromEmail":"rientjes@google.com","sentAt":"2006-08-14T20:31:16Z","receivedAt":"2006-08-14T20:31:16Z","isPatch":true,"sender":{"key":"rientjes@google.com","avatar":null},"body":"Makes do_reupdate void and cleans up function calls.\n\n\t\tDavid\n\nSigned-off-by: David Rientjes <rientjes@google.com>\n---\n builtin-update-index.c |   11 ++++-------\n 1 files changed, 4 insertions(+), 7 deletions(-)\n\ndiff --git a/builtin-update-index.c b/builtin-update-index.c\nindex d2556f3..010adcf 100644\n--- a/builtin-update-index.c\n+++ b/builtin-update-index.c\n@@ -433,8 +433,8 @@ static int do_unresolve(int ac, const ch\n \treturn err;\n }\n \n-static int do_reupdate(int ac, const char **av,\n-\t\t       const char *prefix, int prefix_length)\n+static void do_reupdate(int ac, const char **av,\n+\t\t\tconst char *prefix, int prefix_length)\n {\n \t/* Read HEAD and run update-index on paths that are\n \t * merged and already different between index and HEAD.\n@@ -473,7 +473,6 @@ static int do_reupdate(int ac, const cha\n \t\tif (save_nr != active_nr)\n \t\t\tgoto redo;\n \t}\n-\treturn 0;\n }\n \n int cmd_update_index(int argc, const char **argv, const char *prefix)\n@@ -596,10 +595,8 @@ int cmd_update_index(int argc, const cha\n \t\t\t\tgoto finish;\n \t\t\t}\n \t\t\tif (!strcmp(path, \"--again\")) {\n-\t\t\t\thas_errors = do_reupdate(argc - i, argv + i,\n-\t\t\t\t\t\t\t prefix, prefix_length);\n-\t\t\t\tif (has_errors)\n-\t\t\t\t\tactive_cache_changed = 0;\n+\t\t\t\tdo_reupdate(argc - i, argv + i, prefix,\n+\t\t\t\t\t    prefix_length);\n \t\t\t\tgoto finish;\n \t\t\t}\n \t\t\tif (!strcmp(path, \"--ignore-missing\")) {\n-- \n1.4.2.g89bb-dirty\n"}]}