Fix git-update-index --again

It called read_ref(git_path(..)..), where read_ref does the git_path()
stuff itself.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 0620e779b04146a01f9e06cbbcd535b106034bd6..09214c8a11e6afb927ab6da1aa3f0be5e50888c8 100644 (file)
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -404,9 +404,9 @@ static int unresolve_one(const char *path)
 
 static void read_head_pointers(void)
 {
 
 static void read_head_pointers(void)
 {

-       if (read_ref(git_path("HEAD"), head_sha1))
+       if (read_ref("HEAD", head_sha1))

                die("No HEAD -- no initial commit yet?\n");
                die("No HEAD -- no initial commit yet?\n");

-       if (read_ref(git_path("MERGE_HEAD"), merge_head_sha1)) {
+       if (read_ref("MERGE_HEAD", merge_head_sha1)) {

                fprintf(stderr, "Not in the middle of a merge.\n");
                exit(0);
        }
                fprintf(stderr, "Not in the middle of a merge.\n");
                exit(0);
        }


@@ -443,7 +443,7 @@ static int do_reupdate(int ac, const char **av,
        int has_head = 1;
        const char **pathspec = get_pathspec(prefix, av + 1);
 
        int has_head = 1;
        const char **pathspec = get_pathspec(prefix, av + 1);
 

-       if (read_ref(git_path("HEAD"), head_sha1))
+       if (read_ref("HEAD", head_sha1))

                /* If there is no HEAD, that means it is an initial
                 * commit.  Update everything in the index.
                 */
                /* If there is no HEAD, that means it is an initial
                 * commit.  Update everything in the index.
                 */