From: Shawn Pearce <spearce@spearce.org>
To: git@vger.kernel.org
Subject: Re: [PATCH] Teach git-checkout-index to use file suffixes.
Date: Wed, 1 Mar 2006 10:06:29 -0500 [thread overview]
Message-ID: <20060301150629.GB3456@spearce.org> (raw)
In-Reply-To: <20060301044132.GF22894@spearce.org>
Shawn Pearce <spearce@spearce.org> wrote:
> Sometimes it is useful to unpack the unmerged stage entries
> to the same directory as the tracked file itself, but with
> a suffix indicating which stage that version came from.
> In many user interface level scripts this is being done
> by git-unpack-file followed by creating the necessary
> directory structure and then moving the file into the
> directory with the requested name. It is now possible to
> perform the same action for a larger set of files directly
> through git-checkout-index.
Junio mentioned in his ``What's in git.git'' email that he's not
sure of this command line interface:
Junio C Hamano <junkio@cox.net> wrote:
> I am not sure about the command line interface of this. Would
> it make more sense to checkout three stages in one pass?
>
> - checkout-index --suffix (Shawn Pearce)
I thought about the same thing myself when I submitted the patch
to the list. I probably should have talked a little bit about that
in the email. :-)
I thought about using instead:
--stage=all --suffix1=\#1 --suffix2\=#2 --suffix3=\#3
but then thought that the performance gains achieved by only forking
git-checkout-index once, scanning the index once, etc. were not
that big of a difference compared to the rather horrible looking
command line syntax that produced and required one to use.
If anyone has any suggestions for these options, please pass them
along. I'll rebuild the patch to pull all available stages if we
can come up with a suitable way of describing such.
--
Shawn.
next prev parent reply other threads:[~2006-03-01 15:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-01 4:41 [PATCH] Teach git-checkout-index to use file suffixes Shawn Pearce
2006-03-01 15:06 ` Shawn Pearce [this message]
2006-03-01 15:56 ` Mark Wooding
2006-03-02 6:51 ` Shawn Pearce
2006-03-02 7:59 ` Junio C Hamano
2006-03-02 17:10 ` Shawn Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060301150629.GB3456@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.