user/sven/git.git/combine-diff.c, branch v1.4.4.4

Merge branch 'jc/combined'

2006-10-26T09:07:18Z

* jc/combined: combine-diff: honour --no-commit-id combine-diff: fix hunk_comment_line logic.

combine-diff: honour --no-commit-id

2006-10-26T09:05:59Z

Signed-off-by: Junio C Hamano

combine-diff: fix hunk_comment_line logic.

2006-10-26T09:05:05Z

We forgot that the last element of sline[] is a sentinel without the actual line. *BLUSH* Signed-off-by: Junio C Hamano

Merge branch 'jc/combined'

2006-10-26T08:18:55Z

* jc/combined: combine-diff: a few more finishing touches. Documentation: clarify refname disambiguation rules. diff-format.txt: Combined diff format documentation supplement Remove --syslog in git-daemon inetd documentation examples. Documentation: updates to "Everyday GIT"

combine-diff: a few more finishing touches.

2006-10-26T08:18:49Z

"new file" and "deleted file" were already reported in the original code, but the logic was not as transparent as it could have. This uses a few variables and more comments to clarify the flow. The rule is: (1) if a path exists in the merge result when no parent had it, we report "new" (otherwise it came from the parents, as opposed to have added by the evil merge). (2) if the path does not exist in the merge result, it is "deleted". Since we can say "new" and "deleted", there is no reason not to follow the /dev/null convention. This fixes it. Appending function name after @@@ ... @@@ is trivial, so implement it. Signed-off-by: Junio C Hamano

diff --numstat

2006-10-14T04:37:10Z

[jc: with documentation from Jakub] Signed-off-by: Junio C Hamano

Convert memcpy(a,b,20) to hashcpy(a,b).

2006-08-23T20:53:10Z

This abstracts away the size of the hash values when copying them from memory location to memory location, much as the introduction of hashcmp abstracted away hash value comparsion. A few call sites were using char* rather than unsigned char* so I added the cast rather than open hashcpy to be void*. This is a reasonable tradeoff as most call sites already use unsigned char* and the existing hashcmp is also declared to be unsigned char*. [jc: Splitted the patch to "master" part, to be followed by a patch for merge-recursive.c which is not in "master" yet. Fixed the cast in the latter hunk to combine-diff.c which was wrong in the original. Also converted ones left-over in combine-diff.c, diff-lib.c and upload-pack.c ] Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.

2006-08-17T21:23:53Z

Introduces global inline: hashcmp(const unsigned char *sha1, const unsigned char *sha2) Uses memcmp for comparison and returns the result based on the length of the hash name (a future runtime decision). Acked-by: Alex Riesen Signed-off-by: David Rientjes Signed-off-by: Junio C Hamano

make inline is_null_sha1 global

2006-08-15T22:06:03Z

Replace sha1 comparisons to null_sha1 with a global inline (which previously an unused static inline in builtin-apply.c) [jc: with a fix from Jonas Fonseca.] Signed-off-by: David Rientjes Signed-off-by: Junio C Hamano

Remove combine-diff.c::uninteresting()

2006-08-15T01:41:12Z

A patch from David Rientjes made me realize we do not have to have this function -- just call diff_unmodified_pair() directly. Signed-off-by: Junio C Hamano