Re: Problem with git-apply?

From: Junio C Hamano <junkio@cox.net>
Date: Nov 4, 2006, 18:33 UTC
Message-ID: <7vzmb7vz8d.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0611040821290.25218@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

Show 16 quoted lines

> On Sat, 4 Nov 2006, Junio C Hamano wrote:
>> 
>> The problem appears that GNU diff _never_ uses "--- /dev/null" or "+++ 
>> /dev/null" to indicate creation or deletion of the file, but the 
>> "traditional patch parser" builtin-apply has assumed that is what the 
>> traditional diff output from day one.  Where we got that idea is mystery 
>> to me (this is Linus's code), but I suspect it is what other SCMs did.
>
> No, the original code used to trigger a "create" diff on
>  - source was /dev/null
> OR
>  - source had zero patches.
>
> It used to have code like
>...
> and I think the person who broke it was you ;)

Sorry, if you followed the threads by now you know I know that. A few messages down there is a fix for the breakage caused by 4be60962, which I'll have in 'maint'.

I think it is a time for a 1.4.3.4; these are queued since we did 1.4.3.3.

Andy Parkins (2):
  Minor grammar fixes for git-diff-index.txt
  git-clone documentation didn't mention --origin as equivalent of -o

Christian Couder (3):
  Remove --syslog in git-daemon inetd documentation examples.
  Documentation: add upload-archive service to git-daemon.
  Documentation: add git in /etc/services.

Edgar Toernig (1):
  Use memmove instead of memcpy for overlapping areas

J. Bruce Fields (1):
  Documentation: updates to "Everyday GIT"

Jakub Narebski (3):
  diff-format.txt: Combined diff format documentation supplement
  diff-format.txt: Correct information about pathnames quoting in patch format
  gitweb: Check git base URLs before generating URL from it

Jan Harkes (1):
  Continue traversal when rev-list --unpacked finds a packed commit.

Johannes Schindelin (1):
  link_temp_to_file: call adjust_shared_perm() only when we created the directory

Junio C Hamano (9):
  Documentation: clarify refname disambiguation rules.
  combine-diff: a few more finishing touches.
  combine-diff: fix hunk_comment_line logic.
  combine-diff: honour --no-commit-id
  Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
  quote.c: ensure the same quoting across platforms.
  revision traversal: --unpacked does not limit commit list anymore.
  link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
  apply: handle "traditional" creation/deletion diff correctly.

Nicolas Pitre (1):
  pack-objects doesn't create random pack names

Rene Scharfe (1):
  git-cherry: document limit and add diagram