Dear diary, on Fri, Apr 15, 2005 at 12:57:25AM CEST, I got a letter
where Martin Schlemmer <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]>
>
> 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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
