From: Junio C Hamano Date: Tue, 22 Nov 2005 05:36:12 GMT Subject: Re: index manipulation -- how? Message-ID: <7v3blpi6r7.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <7v8xvhi7bi.fsf@assigned-by-dhcp.cox.net> Junio C Hamano writes: > Luben Tuikov writes: > >> How do I reverse a _single_ "git-update-index" operation? >> Be it --add or just an update. > > Reverting working tree files are "git checkout HEAD the-file" > (both index and working tree file from the head commit) or "git > checkout -- the-file" (working tree file from the index), but I > do not think there is a prepackaged way to revert only a single > index path offhand. > > git-ls-tree HEAD the-file | > sed -e 's/^\([0-7]*\) [^ ]* \(.*\)/\1 \2/' | > git-update-index --index-info > > should work. > > I think changing update-index --index-info so that you can lose > the sed in between without breaking its other usage (it reads > from git-apply --index-info, which does not say " blob " which > is what the sed is stripping out) is a worthwhile thing to do. And here is the patch to let you say: git-ls-tree HEAD the-file | git-update-index --index-info --- diff --git a/update-index.c b/update-index.c index 5bbc3de..11b7f6a 100644 --- a/update-index.c +++ b/update-index.c @@ -338,7 +338,7 @@ static void read_index_info(int line_ter 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_ter 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);