git, branch v1.4.1.1

upload-pack: fix timeout in create_pack_file

2006-07-25T01:37:40Z

Signed-off-by: Matthias Lederhofer Signed-off-by: Junio C Hamano

Makefile: tighten git-http-{fetch,push} dependencies

2006-07-03T07:58:34Z

Although our "git-%$X:" implicit target had dependency on $(GITLIBS) which included xdiff/lib.a, git-http-{fetch,push} had their own building rules and with an obsolete dependency on $(LIB_FILES). Update the rules to depend on $(GITLIBS), to make parallel build work correctly. Signed-off-by: Junio C Hamano

Empty author may be presented by svn as an empty string or a null value.

2006-07-03T00:07:45Z

Signed-off-by: Junio C Hamano

revision.c: fix "dense" under --remove-empty

2006-07-02T17:55:59Z

It had the wrong test for whether a commit was a merge. What it did was to say that a non-merge has exactly one parent (which sounds almost right), but the fact is, initial trees have no parent at all, but they're obviously not merges. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

git object hash cleanups

2006-07-02T01:28:15Z

This IMNSHO cleans up the object hashing. The hash expansion is separated out into a function of its own, the hash array (and size) names are made more obvious, and the code is generally made to look a bit more like the object-ref hashing. It also gets rid of "find_object()" returning an index (or negative position if no object is found), since that is made redundant by the simplified object rehashing. The basic operation is now "lookup_object()" which just returns the object itself. There's an almost unmeasurable speed increase, but more importantly, I think the end result is more readable. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

revision.c: --full-history fix.

2006-07-02T01:21:03Z

With history simplification, we still show merges that are required to make the history _complete_, i.e. say that you had: a | b / \ c d | | and neither "a" nor "b" actually changed the file, but both "c" and "d" did: in this case we have to leave "b" around just because otherwise there would be no way to show the _relationship_, even if "b" itself doesn't actually change the tree in any way what-so-ever. It would make sense to make that further simplification if the "--parents" flag wasn't present. In that case the user is literally asking for a list of commits and is not interested in the relationship between them. This patch also fixes a real bug. Without this patch, the "--parents --full-history" combination (which you'd get if you do something like gitk --full-history Makefile or similar) will actually _drop_ merges where all children are identical. That's wrong in the --full-history case, because it means that the graph ends up missing lots of entries. In the process, this also should make git-rev-list --full-history Makefile give just the _true_ list of all commits that changed Makefile (and properly ignore merges that were identical in one parent), because now we're not asking for "--parent", so we don't need the unnecessary merge commits to keep the history together. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Fix errno usage in connect.c

2006-07-02T00:09:26Z

errno was used after it could've been modified by a subsequent library call. Spotted by Morten Welinder. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

Minor documentation fixup.

2006-07-02T00:09:01Z

Signed-off-by: Robin Rosenberg Signed-off-by: Junio C Hamano

git-svn: allow a local target directory to be specified for init

2006-07-01T05:50:47Z

git-svn init url://to/the/repo local-repo will create the local-repo dirrectory if doesn't exist yet and populate it as expected. Original patch by Luca Barbato, cleaned up and made to work for the current version of git-svn by me (Eric Wong). Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

don't load objects needlessly when repacking

2006-07-01T03:14:47Z

If no delta is attempted on some objects then it is useless to load them in memory, neither create any delta index for them. The best thing to do is therefore to load and index them only when really needed. Signed-off-by: Nicolas Pitre Signed-off-by: Junio C Hamano