git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Jon Smirl" <jonsmirl@gmail.com>
To: "Junio C Hamano" <junkio@cox.net>, "Petr Baudis" <pasky@suse.cz>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
Date: Wed, 26 Jul 2006 16:33:06 -0400	[thread overview]
Message-ID: <9e4733910607261333k3ec961f7yd012566aa9aa6ed8@mail.gmail.com> (raw)
In-Reply-To: <7vmzawqi1m.fsf@assigned-by-dhcp.cox.net>

On 7/26/06, Junio C Hamano <junkio@cox.net> wrote:
> Junio C Hamano <junkio@cox.net> writes:
>
> > "Jon Smirl" <jonsmirl@gmail.com> writes:
> >
> >> git diff HEAD makes a much longer patch that deltas out the existing
> >> files and delta in the new file.
> >>
> >> It's applying patches in the extended git format that fails.
> >
> > Thanks.
>
> ... and it turns out that "git apply" (with or without --index)
> groks it just fine.  I suspect the fix is quite recent (not in
> v1.4.2-rc1 but in v1.4.2-rc2).

I can confirm that git apply is handling this correctly with code from
the current git tree. cogito is failing this case.

-- 
Jon Smirl
jonsmirl@gmail.com

  reply	other threads:[~2006-07-26 20:33 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-26 17:41 [PATCH 1/2] t7001: add test for git-mv dir1 dir2/ Johannes Schindelin
2006-07-26 17:50 ` Jon Smirl
2006-07-26 18:23   ` Junio C Hamano
2006-07-26 18:31     ` Jon Smirl
2006-07-26 18:58       ` Junio C Hamano
2006-07-26 19:31         ` Junio C Hamano
2006-07-26 20:33           ` Jon Smirl [this message]
2006-07-26 18:47   ` Johannes Schindelin
2006-07-26 18:39 ` Josef Weidendorfer
2006-07-26 19:05   ` Junio C Hamano
2006-07-28  1:30   ` Petr Baudis
2006-07-28  2:41     ` Junio C Hamano
2006-07-28  2:56       ` Petr Baudis
2006-07-28  4:48         ` Junio C Hamano
2006-07-28 15:47           ` Petr Baudis
2006-07-28 10:14     ` [PATCH] Teach git-apply about '-R' Johannes Schindelin
2006-07-28 15:14       ` Linus Torvalds
2006-07-28 15:46         ` [PATCH v2] " Johannes Schindelin
2006-07-28 15:36       ` [PATCH] " Junio C Hamano
2006-07-28 15:50         ` Johannes Schindelin
2006-07-28 19:20           ` Junio C Hamano
2006-07-28 19:36             ` Johannes Schindelin

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9e4733910607261333k3ec961f7yd012566aa9aa6ed8@mail.gmail.com \
    --to=jonsmirl@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=pasky@suse.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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).