aboutsummaryrefslogtreecommitdiff
path: root/update-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-21 21:46:57 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-23 22:25:55 -0800
commit9c20a4706767e6003e62f6500ed94ccddcbe322f (patch)
tree69b036a2f2ab6f8f49bb7d61f71d1f363bd753aa /update-index.c
parentb7884981f8f2a063f577df12c65e9af8b1a4f1b8 (diff)
downloadgit-9c20a4706767e6003e62f6500ed94ccddcbe322f.tar.gz
git-9c20a4706767e6003e62f6500ed94ccddcbe322f.tar.xz
Teach update-index to read from ls-tree.
git-update-index --index-info can almost be usable to read from ls-tree output to update the index (and not the working tree file) to HEAD commit, but not quite. It was designed to read from git-apply --index-info output, and does not want " blob " in ls-tree output. Accept that as well. This lets us update "git-checkout <ent> <path>" that used to filter the extra " blob " string out. Noted by Luben. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'update-index.c')
-rw-r--r--update-index.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/update-index.c b/update-index.c
index 5bbc3de28..11b7f6a51 100644
--- a/update-index.c
+++ b/update-index.c
@@ -338,7 +338,7 @@ static void read_index_info(int line_termination)
struct strbuf buf;
strbuf_init(&buf);
while (1) {
- char *ptr;
+ char *ptr, *tab;
char *path_name;
unsigned char sha1[20];
unsigned int mode;
@@ -348,12 +348,15 @@ static void read_index_info(int line_termination)
break;
mode = strtoul(buf.buf, &ptr, 8);
- if (ptr == buf.buf || *ptr != ' ' ||
- get_sha1_hex(ptr + 1, sha1) ||
- ptr[41] != '\t')
+ if (ptr == buf.buf || *ptr != ' ')
goto bad_line;
- ptr += 42;
+ tab = strchr(ptr, '\t');
+ if (!tab || tab - ptr < 41)
+ goto bad_line;
+ if (get_sha1_hex(tab - 40, sha1) || tab[-41] != ' ')
+ goto bad_line;
+ ptr = tab + 1;
if (line_termination && ptr[0] == '"')
path_name = unquote_c_style(ptr, NULL);