Merge branch 'bc/reflog-fix' into js/reflog-delete

* bc/reflog-fix: (1490 commits)
  builtin-reflog.c: don't install new reflog on write failure
  hash: fix lookup_hash semantics
  gitweb: Better chopping in commit search results
  builtin-tag.c: remove cruft
  git-merge-index documentation: clarify synopsis
  send-email: fix In-Reply-To regression
  git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
  Teach git-grep --name-only as synonym for -l
  diff: fix java funcname pattern for solaris
  t3404: use configured shell instead of /bin/sh
  git_config_*: don't assume we are parsing a config file
  prefix_path: use is_absolute_path() instead of *orig == '/'
  git-clean: handle errors if removing files fails
  Clarified the meaning of git-add -u in the documentation
  git-clone.sh: properly configure remote even if remote's head is dangling
  git.el: Set process-environment instead of invoking env
  Documentation/git-stash: document options for git stash list
  send-email: squelch warning due to comparing undefined $_ to ""
  cvsexportcommit: be graceful when "cvs status" reorders the arguments
  Rename git-core rpm to just git and rename the meta-pacakge to git-all.
  ...

Conflicts:

	Documentation/git-reflog.txt
	t/t1410-reflog.sh

1 files changed, 55 insertions, 0 deletions

diff --git a/t/t9117-git-svn-init-clone.sh b/t/t9117-git-svn-init-clone.sh
new file mode 100755
index 0000000000..d482b407f2
--- /dev/null
+++ b/t/t9117-git-svn-init-clone.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Copyright (c) 2007 Eric Wong
+#
+
+test_description='git-svn init/clone tests'
+
+. ./lib-git-svn.sh
+
+# setup, run inside tmp so we don't have any conflicts with $svnrepo
+set -e
+rm -r .git
+mkdir tmp
+cd tmp
+
+test_expect_success 'setup svnrepo' "
+	mkdir project project/trunk project/branches project/tags &&
+	echo foo > project/trunk/foo &&
+	svn import -m '$test_description' project $svnrepo/project &&
+	rm -rf project
+	"
+
+test_expect_success 'basic clone' "
+	test ! -d trunk &&
+	git svn clone $svnrepo/project/trunk &&
+	test -d trunk/.git/svn &&
+	test -e trunk/foo &&
+	rm -rf trunk
+	"
+
+test_expect_success 'clone to target directory' "
+	test ! -d target &&
+	git svn clone $svnrepo/project/trunk target &&
+	test -d target/.git/svn &&
+	test -e target/foo &&
+	rm -rf target
+	"
+
+test_expect_success 'clone with --stdlayout' "
+	test ! -d project &&
+	git svn clone -s $svnrepo/project &&
+	test -d project/.git/svn &&
+	test -e project/foo &&
+	rm -rf project
+	"
+
+test_expect_success 'clone to target directory with --stdlayout' "
+	test ! -d target &&
+	git svn clone -s $svnrepo/project target &&
+	test -d target/.git/svn &&
+	test -e target/foo &&
+	rm -rf target
+	"
+
+test_done