delta/git.git, branch v1.4.2.4

Fix hash function in xdiff library

2006-10-17T04:27:44+00:00

Jim Mayering noticed that xdiff library took insanely long time
when comparing files with many identical lines.

This was because the hash function used in the library is broken
on 64-bit architectures and caused too many collisions.

http://thread.gmane.org/gmane.comp.version-control.git/28962/focus=28994

Acked-by: Davide Libenzi 
Signed-off-by: Junio C Hamano

git-push: .git/remotes/ file does not require SP after colon

2006-10-02T07:43:52+00:00

Although most people would have one after colon if only for
readability, we never required it in git-parse-remote, so let's
not require one only in git-push.

Signed-off-by: Junio C Hamano

git-mv: invalidate the removed path properly in cache-tree

2006-10-02T06:32:39+00:00

The command updated the cache without invalidating the cache
tree entries while removing an existing entry.

Signed-off-by: Junio C Hamano

git-diff -B output fix.

2006-09-30T05:32:16+00:00

Geert noticed that complete rewrite diff missed the usual a/ and b/
leading paths.  Pickaxe says it never worked, ever.

Embarrassing.

Signed-off-by: Junio C Hamano 
(cherry picked from bc1a5807575b2f34538d4158834da6524a4fc1f7 commit)

Fix git-am safety checks

2006-09-18T05:13:01+00:00

An earlier commit cbd64af added a check that prevents "git-am"
to run without its standard input connected to a terminal while
resuming operation.  This was to catch a user error to try
feeding a new patch from its standard input while recovery.

The assumption of the check was that it is an indication that a
new patch is being fed if the standard input is not connected to
a terminal.  It is however not quite correct (the standard input
can be /dev/null if the user knows the operation does not need
any input, for example).  This broke t3403 when the test was run
with its standard input connected to /dev/null.

When git-am is given an explicit command such as --skip, there
is no reason to insist that the standard input is a terminal; we
are not going to read a new patch anyway.

Credit goes to Gerrit Pape for noticing and reporting the
problem with t3403-rebase-skip test.

Signed-off-by: Junio C Hamano

Fix duplicate xmalloc in builtin-add

2006-09-18T04:40:03+00:00

[jc: patch came without sign-off but it was too obvious and trivial.]

Signed-off-by: Junio C Hamano

http-fetch: fix alternates handling.

2006-09-13T07:54:43+00:00

Fetch over http from a repository that uses alternates to borrow
from neighbouring repositories were quite broken, apparently for
some time now.

We parse input and count bytes to allocate the new buffer, and
when we copy into that buffer we know exactly how many bytes we
want to copy from where.  Using strlcpy for it was simply
stupid, and the code forgot to take it into account that strlcpy
terminated the string with NUL.

Signed-off-by: Junio C Hamano

builtin-mv: readability patch

2006-08-21T21:15:52+00:00

The old version was not liked at all. This is hopefully better. Oh, and it
gets rid of the goto.

Note that it does not change any functionality.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

git-mv: fix off-by-one error

2006-08-21T21:15:45+00:00

Embarassing.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

git-mv: special case destination "."

2006-08-21T21:15:43+00:00

Since the normalized basename of "." is "", the check for directory
failed erroneously.

Noticed by Fredrik Kuivinen.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano