From: Petr Baudis <pasky@ucw.cz>
To: Martin Schlemmer <azarah@nosferatu.za.org>
Cc: GIT Mailing Lists <git@vger.kernel.org>
Subject: Re: update gitcancel.sh to handle modes as well
Date: Fri, 15 Apr 2005 00:57:22 +0200 [thread overview]
Message-ID: <20050414225722.GR22699@pasky.ji.cz> (raw)
In-Reply-To: <1113519445.23299.119.camel@nosferatu.lan>
Dear diary, on Fri, Apr 15, 2005 at 12:57:25AM CEST, I got a letter
where Martin Schlemmer <azarah@nosferatu.za.org> told me that...
> Hi,
>
> gitcancel.sh do not handle mode changes:
>
> ----
> $ chmod -x Makefile
> $ git cancel
> patch: **** Only garbage was found in the patch input.
> ----
>
> 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>
>
> gittrack.sh: 03d6db1fb3a70605ef249c632c04e542457f0808
> --- 03d6db1fb3a70605ef249c632c04e542457f0808/gittrack.sh
> +++ uncommitted/gittrack.sh
> @@ -51,6 +51,7 @@
>
> read-tree $(tree-id "$name")
> gitdiff.sh local "$name" | gitapply.sh
> + update-cache --refresh
>
> else
> [ "$tracking" ] || \
> @@ -61,6 +62,7 @@
> if [ -s ".git/HEAD.local" ]; then
> gitdiff.sh "$tracking" local | gitapply.sh
> read-tree $(tree-id local)
> + update-cache --refresh
>
> head=$(cat .git/HEAD)
> branchhead=$(cat .git/heads/$tracking)
The patch looks familiar, but not right. ;-)
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
next prev parent reply other threads:[~2005-04-14 22:57 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 [this message]
2005-04-14 23:04 ` 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
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=20050414225722.GR22699@pasky.ji.cz \
--to=pasky@ucw.cz \
--cc=azarah@nosferatu.za.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox