Re: index manipulation -- how?
- From
- Luben Tuikov <ltuikov@yahoo.com>
- Date
- Nov 22, 2005, 06:20 UTC
- Message-ID
- <20051122062048.8891.qmail@web31805.mail.mud.yahoo.com>
- In-Reply-To
- <7v3blpi6r7.fsf@assigned-by-dhcp.cox.net>
--- Junio C Hamano <junkio@cox.net> wrote:
Show 16 quoted lines
> Junio C Hamano <junkio@cox.net> writes: > > > Luben Tuikov <ltuikov@yahoo.com> 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
Ok. (There is a very similar construct in git-checkout.sh. So if you apply the patch below, please make sure git-checkout.sh doesn't break.)
Question: so in effect, more generally: git checkout <tree-ish> <file>
would do the right thing: update index and the working tree as the file <file> looked as it was at <tree-ish>?
Is that correct? Can someone confirm/deny?
Luben P.S. So both methods as mentioned by Linus and Junio do what I asked about.
Show 55 quoted lines
> >
> > 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);
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>