From: Martin Schlemmer <azarah@nosferatu.za.org>
To: Petr Baudis <pasky@ucw.cz>
Cc: GIT Mailing Lists <git@vger.kernel.org>
Subject: Re: Re: [patch pasky] update gitcancel.sh to handle modes as well
Date: Fri, 15 Apr 2005 01:39:06 +0200 [thread overview]
Message-ID: <1113521946.23299.143.camel@nosferatu.lan> (raw)
In-Reply-To: <20050414231558.GW22699@pasky.ji.cz>
[-- Attachment #1: Type: text/plain, Size: 969 bytes --]
On Fri, 2005-04-15 at 01:15 +0200, Petr Baudis wrote:
> Dear diary, on Fri, Apr 15, 2005 at 01:04:50AM CEST, I got a letter
> where Martin Schlemmer <azarah@nosferatu.za.org> told me that...
> > Rather use checkout-cache to sync our tree, as should do the right thing
> > instead of diffing (cancel imply just blow away everything).
> >
> > Signed-off-by: Martin Schlemmer <azarah@nosferatu.za.org>
> >
> > gitcancel.sh: 839b3c58f20f6eb8412f499a891e007e2e67d114
> > --- 839b3c58f20f6eb8412f499a891e007e2e67d114/gitcancel.sh
> > +++ uncommitted/gitcancel.sh
> > @@ -10,9 +10,8 @@
> > #
> > # Takes no arguments. Takes the evil changes from the tree.
> >
> > -# FIXME: Does not revert mode changes!
> >
> > -show-diff | patch -p0 -R
> > rm -f .git/add-queue .git/rm-queue
> > +checkout-cache -q -f -a
> >
> > update-cache --refresh
>
PS, shouldn't we add a read-tree $(tree-id) before the checkout-cache?
--
Martin Schlemmer
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2005-04-14 23:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-14 22:57 [patch pasky] update gitcancel.sh to handle modes as well Martin Schlemmer
2005-04-14 22:57 ` Petr Baudis
2005-04-14 23:04 ` [patch pasky] " Martin Schlemmer
2005-04-14 23:07 ` Petr Baudis
2005-04-14 23:14 ` Martin Schlemmer
[not found] ` <20050414231558.GW22699@pasky.ji.cz>
2005-04-14 23:39 ` Martin Schlemmer [this message]
2005-04-14 23:49 ` Petr Baudis
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=1113521946.23299.143.camel@nosferatu.lan \
--to=azarah@nosferatu.za.org \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox