Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maint

diff --git a/builtin/update-index.c b/builtin/update-index.c
index e8c7fd4d4957b83de42e7af2ef9f2676bfc294b2..b0e3dc91055ec7e7579fb5f1964879a99fd71606 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -4,6 +4,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "lockfile.h"
 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
@@ -942,7 +943,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                if (newfd < 0) {
                        if (refresh_args.flags & REFRESH_QUIET)
                                exit(128);
-                       unable_to_lock_index_die(get_index_file(), lock_error);
+                       unable_to_lock_die(get_index_file(), lock_error);
                }
                if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
                        die("Unable to write new index file");