Merge branch 'br/mergetools-guiffy'

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 9625d1e10a691c1dbd2ec2aa5d10a6c8a6ca7885..10d070a76fb1b0b94c058f60934bb05db37a4164 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1059,6 +1059,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                        break;
                switch (parseopt_state) {
                case PARSE_OPT_HELP:
+               case PARSE_OPT_ERROR:
                        exit(129);
                case PARSE_OPT_NON_OPTION:
                case PARSE_OPT_DONE: