diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-09-21 21:29:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-22 03:54:41 (GMT) |
| commit | 913c983e0481b477ccc11fa72ebeb0d6ec8d06aa (patch) | |
| tree | c491be37f1786430906b538a1b058377dc98d185 /builtin-update-index.c | |
| parent | 968846015229fe0fec28e3c85db722e131c15f93 (diff) | |
| download | git-913c983e0481b477ccc11fa72ebeb0d6ec8d06aa.zip git-913c983e0481b477ccc11fa72ebeb0d6ec8d06aa.tar.gz git-913c983e0481b477ccc11fa72ebeb0d6ec8d06aa.tar.bz2 | |
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>
Diffstat (limited to 'builtin-update-index.c')
| -rw-r--r-- | builtin-update-index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-update-index.c b/builtin-update-index.c index 0620e77..09214c8 100644 --- 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) { - if (read_ref(git_path("HEAD"), head_sha1)) + if (read_ref("HEAD", head_sha1)) 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); } @@ -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); - 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. */ |