git, branch v1.2.2

Fix retries in git-cvsimport

2006-02-19T00:19:00Z

Fixed a couple of bugs in recovering from broken connections: The _line() method now returns undef correctly when the connection is broken instead of falling off the function and returning garbage. Retries are now reported to stderr and the eventual partially downloaded file is discarded instead of being appended to. The "Server gone away" test has been removed, because it was reachable only if the garbage return bug bit. Signed-off-by: Martin Mares Signed-off-by: Junio C Hamano

archimport: remove files from the index before adding/updating

2006-02-18T19:21:16Z

This fixes a bug when importing where a directory gets removed/renamed but is immediately replaced by a file of the same name in the same changeset. This fix only applies to the accurate (default) strategy the moment. This patch should also fix the fast strategy if/when it is updated to handle the cases that would've triggered this bug. This bug was originally found in git-svn, but I remembered I did the same thing with archimport as well. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

Make git-reset delete empty directories

2006-02-18T07:52:57Z

When git-reset --hard is used and a subdirectory becomes empty (as it contains no tracked files in the target tree) the empty subdirectory should be removed. This matches the behavior of git-checkout-index and git-read-tree -m which would not have created the subdirectory or would have deleted it when updating the working directory. Subdirectories which are not empty will be left behind. This may happen if the subdirectory still contains object files from the user's build process (for example). [jc: simplified the logic a bit, while keeping the test script.]

Document --short and --git-dir in git-rev-parse(1)

2006-02-18T01:33:12Z

Signed-off-by: Jonas Fonseca

git-rev-parse: Fix --short= option parsing

2006-02-18T01:33:11Z

Signed-off-by: Jonas Fonseca

Prevent git-upload-pack segfault if object cannot be found

2006-02-18T00:20:51Z

Signed-off-by: Carl Worth Signed-off-by: Junio C Hamano

Abstract test_create_repo out for use in tests.

2006-02-18T00:16:53Z

Signed-off-by: Carl Worth Signed-off-by: Junio C Hamano

Trap exit to clean up created directory if clone fails.

2006-02-18T00:16:49Z

Signed-off-by: Carl Worth Signed-off-by: Junio C Hamano

More useful/hinting error messages in git-checkout

2006-02-16T03:14:04Z

Signed-off-by: Josef Weidendorfer Signed-off-by: Junio C Hamano

Print an error if cloning a http repo and NO_CURL is set

2006-02-16T03:14:01Z

If Git is compiled with NO_CURL=YesPlease and one tries to clone a http repository, git-clone tries to call the curl binary. This trivial patch prints an error instead in such situation. Signed-off-by: Fernando J. Pereda Signed-off-by: Junio C Hamano