From: Robert Fitzsimons <robfitz@273k.net>
To: Junio C Hamano <junkio@cox.net>
Cc: Robert Fitzsimons <robfitz@273k.net>, git@vger.kernel.org
Subject: Re: [PATCH 1/9] Fix git patch header processing in git-apply.
Date: Mon, 29 Aug 2005 23:58:23 +0000 [thread overview]
Message-ID: <20050829235823.GA19351@localhost> (raw)
In-Reply-To: <7vslwtein3.fsf@assigned-by-dhcp.cox.net>
I should have mentioned before, these changes are being used in a
SourcePuller dump file to git import script I've been working on.
> I further wanted to apply the following to the proposed updates
> branch, but even with only the first one applied, it fails its
> own test, t4104-apply-complex.sh:
The test was the problem it tried to work with empty files.
> * Fix processing of a patch file which modifies the same file in git-apply.
> * Fix the processing of multiple patch files with --check in git-apply.
> * New option --ignore-applied for git-apply.
I've fixed up the problems with these patches and rebased them.
> * New option --ignore-whitespace for git-apply.
This change was just wrong and could cause file corruption, I've got
another version in the works which fixes the problem and adds some of
the suggested features.
Robert Fitzsimons
robfitz@273k.net
next prev parent reply other threads:[~2005-08-29 23:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-28 15:24 [PATCH 1/9] Fix git patch header processing in git-apply Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 2/9] Fix detection of files with only one line " Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 3/9] Fix processing of a patch file which modifies the same file " Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 4/9] Fix the procssing of multiple patch files with --check " Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 5/9] New option --force-delete for git-apply Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 6/9] New option --ignore-whitespace " Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 7/9] New option --ignore-applied " Robert Fitzsimons
2005-08-28 15:25 ` [PATCH 8/9] New git-apply test cases for patches with mulitple fragments Robert Fitzsimons
2005-08-28 15:25 ` [PATCH 9/9] New git-apply test cases for scanning forwards and backwards Robert Fitzsimons
2005-08-28 16:58 ` [PATCH 6/9] New option --ignore-whitespace for git-apply Linus Torvalds
2005-08-28 20:49 ` A Large Angry SCM
2005-08-28 21:06 ` Junio C Hamano
2005-08-28 21:06 ` [PATCH 5/9] New option --force-delete " Junio C Hamano
2005-08-28 21:06 ` [PATCH 3/9] Fix processing of a patch file which modifies the same file in git-apply Junio C Hamano
2005-08-28 16:55 ` [PATCH 2/9] Fix detection of files with only one line " Linus Torvalds
2005-08-28 23:39 ` [PATCH 1/9] Fix git patch header processing " Junio C Hamano
2005-08-29 23:58 ` Robert Fitzsimons [this message]
2005-08-30 0:47 ` Linus Torvalds
2005-08-30 1:09 ` Junio C Hamano
2005-08-30 1:24 ` Linus Torvalds
2005-08-30 1:34 ` Junio C Hamano
2005-08-30 2:00 ` Linus Torvalds
2005-08-30 7:36 ` Martin Langhoff
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=20050829235823.GA19351@localhost \
--to=robfitz@273k.net \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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;
as well as URLs for NNTP newsgroup(s).