Re: [PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-30 Thread Martin Langhoff
On 8/30/05, Linus Torvalds <[EMAIL PROTECTED]> wrote: > Actually, an import should preferably never use patches at all, since that > never really works for binary data. This is why the CVS importer actually > checks out full files and imports them that way. The patch-based ones will > fundamentally

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-29 Thread Linus Torvalds
On Mon, 29 Aug 2005, Junio C Hamano wrote: > > The code is simple enough and I see some beauty in it, but I > honor your veto, at least for now. Well, I didn't actually veto it when I saw the feature the first time, because I think it's a valid thing to do when applying patches by hand. It wa

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-29 Thread Junio C Hamano
Linus Torvalds <[EMAIL PROTECTED]> writes: > On Mon, 29 Aug 2005, Junio C Hamano wrote: >> >> I, however, am not 100% convinced --ignore-applied is too >> dangerous to be useful in any conceivable use cases, at least >> not yet. For example, you might be cherry-picking a change from >> a foreign

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-29 Thread Linus Torvalds
On Mon, 29 Aug 2005, Junio C Hamano wrote: > > I, however, am not 100% convinced --ignore-applied is too > dangerous to be useful in any conceivable use cases, at least > not yet. For example, you might be cherry-picking a change from > a foreign branch with 'git-diff-tree -p other~45 | git app

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-29 Thread Junio C Hamano
Linus Torvalds <[EMAIL PROTECTED]> writes: > Hmm. Anything that depends on "--ignore-applied" is fundamentally broken > as an import tool. There's no way something like that can be valid, since > it inhently means that somebody is trying to apply a patch that simple > isn't applicable. > > Don't d

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-29 Thread Linus Torvalds
On Mon, 29 Aug 2005, Robert Fitzsimons wrote: > > I should have mentioned before, these changes are being used in a > SourcePuller dump file to git import script I've been working on. Hmm. Anything that depends on "--ignore-applied" is fundamentally broken as an import tool. There's no way somet

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-29 Thread Robert Fitzsimons
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:

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-28 Thread Junio C Hamano
Thanks for "apply" patches. I have merged some of them and pushed out. 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: * Fix processing of a patch file which modifies the same file in

[PATCH 1/9] Fix git patch header processing in git-apply.

2005-08-28 Thread Robert Fitzsimons
Stop processing and return NULL if we encounter a '\n' character before we have two matching names in the git header. Signed-off-by: Robert Fitzsimons <[EMAIL PROTECTED]> --- apply.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 289e53f770e37dfe25c740788256d24c19c2e16d diff --git