Skip to main content

Browse the archive

Revision c1ab3b8a44149a8dfb8968a958b13ac9e8d9579a authored by Junio C Hamano on 27 February 2018, 18:43:54 UTC, committed by Junio C Hamano on 27 February 2018, 18:43:54 UTC 
Merge branch 'ab/commit-m-with-fixup' into maint
 
"git commit --fixup" did not allow "-m<message>" option to be used
at the same time; allow it to annotate resulting commit with more
text.

* ab/commit-m-with-fixup:
  commit: add support for --fixup <commit> -m"<extra message>"
  commit doc: document that -c, -C, -F and --fixup with -m error
2 parent s 12accdc + 30884c9
Raw File
t9103-git-svn-tracked-directory-removed.sh 
#!/bin/sh
#
# Copyright (c) 2007 Eric Wong
#

test_description='git svn tracking removed top-level path'
. ./lib-git-svn.sh

test_expect_success 'make history for tracking' '
	mkdir import &&
	mkdir import/trunk &&
	echo hello >> import/trunk/README &&
	svn_cmd import -m initial import "$svnrepo" &&
	rm -rf import &&
	svn_cmd co "$svnrepo"/trunk trunk &&
	echo bye bye >> trunk/README &&
	svn_cmd rm -m "gone" "$svnrepo"/trunk &&
	rm -rf trunk &&
	mkdir trunk &&
	echo "new" > trunk/FOLLOWME &&
	svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
'

test_expect_success 'clone repo with git' '
	git svn clone -s "$svnrepo" x &&
	test_path_is_file x/FOLLOWME &&
	test_path_is_missing x/README
'

test_expect_success 'make sure r2 still has old file' '
	(
		cd x &&
		test -n "$(git svn find-rev r1)" &&
		git reset --hard "$(git svn find-rev r1)" &&
		test_path_is_file README &&
		test_path_is_missing FOLLOWME &&
		test -z "$(git svn find-rev r2)"
	)
'

test_done
back to top