git, branch v1.3.0-rc1

GIT 1.3.0 rc1

2006-03-28T00:08:29Z

All of the things that were not in the "master" branch were either cooked long enough in "next" without causing problems (e.g. insanely fast rename detector or true built-in diff) or isolated in a specific subsystem (e.g. tar-tree and svnimport). So I am clearing the deck to prepare for a 1.3.0. Remaining wrinkles, if any, will be ironed in the "master" branch. Signed-off-by: Junio C Hamano

Merge branch ak/svn

2006-03-28T00:03:36Z

Merge branch 'lt/diffgen' into next

2006-03-27T07:44:28Z

* lt/diffgen: add clean and ignore rules for xdiff/ Remove dependency on a file named "-lz"

Merge branch 'master' into next

2006-03-27T07:44:14Z

* master: Optionally do not list empty directories in git-ls-files --others Document git-rebase behavior on conflicts. Fix error handling for nonexistent names

add clean and ignore rules for xdiff/

2006-03-27T07:41:22Z

Signed-off-by: Junio C Hamano

Optionally do not list empty directories in git-ls-files --others

2006-03-27T03:08:24Z

Without the --directory flag, git-ls-files wouldn't ever list directories, producing no output for empty directories, which is good since they cannot be added and they bear no content, even untracked one (if Git ever starts tracking directories on their own, this should obviously change since the content notion will change). With the --directory flag however, git-ls-files would list even empty directories. This may be good in some situations but sometimes you want to prevent that. This patch adds a --no-empty-directory option which makes git-ls-files omit empty directories. Signed-off-by: Petr Baudis

Document git-rebase behavior on conflicts.

2006-03-27T03:07:43Z

Remove dependency on a file named "-lz"

2006-03-27T03:07:08Z

By changing the dependency "$(LIB_H)" to "$(LIBS)", at least one version of make thought that a file named "-lz" would be needed. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Fix error handling for nonexistent names

2006-03-27T03:06:17Z

When passing in a pathname pattern without the "--" separator on the command line, we verify that the pathnames in question exist. However, there were two bugs in that verification: - git-rev-parse would only check the first pathname, and silently allow any invalid subsequent pathname, whether it existed or not (which defeats the purpose of the check, and is also inconsistent with what git-rev-list actually does) - git-rev-list (and "git log" etc) would check each filename, but if the check failed, it would print the error using the first one, i.e.: [torvalds@g5 git]$ git log Makefile bad-file fatal: 'Makefile': No such file or directory instead of saying that it's 'bad-file' that doesn't exist. This fixes both bugs. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Merge branch 'jc/thin' into next

2006-03-26T08:24:03Z

* jc/thin: git-push: make --thin pack transfer the default. gitk: Fix two bugs reported by users gitk: Improve appearance of first child links gitk: Make downward-pointing arrows end in vertical line segment gitk: Don't change cursor at end of layout if find in progress gitk: Make commitdata an array rather than a list gitk: Fix display of diff lines beginning with --- or +++ [PATCH] gitk: Make error_popup react to Return gitk: Fix a bug in drawing the selected line as a thick line gitk: Further speedups gitk: Various speed improvements gitk: Fix Update menu item gitk: Fix clicks on arrows on line ends gitk: New improved gitk contrib/git-svn: stabilize memory usage for big fetches