From 3c4c7351c030a18fa94076ffe62f534f890e9602 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 May 2006 19:03:45 -0700 Subject: git-svn: t0001: workaround a heredoc bug in old versions of dash The dash installed on my Debian Sarge boxes don't seem to like <<'' as a heredoc starter. Recent versions of dash do not need this fix. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- contrib/git-svn/t/t0001-contrib-git-svn-props.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'contrib/git-svn') diff --git a/contrib/git-svn/t/t0001-contrib-git-svn-props.sh b/contrib/git-svn/t/t0001-contrib-git-svn-props.sh index 6fa7889e9a..23a5a2a223 100644 --- a/contrib/git-svn/t/t0001-contrib-git-svn-props.sh +++ b/contrib/git-svn/t/t0001-contrib-git-svn-props.sh @@ -20,9 +20,10 @@ a_empty_cr= a_empty_crlf= cd import - cat >> kw.c <<'' + cat >> kw.c <<\EOF /* Make it look like somebody copied a file from CVS into SVN: */ /* $Id: kw.c,v 1.1.1.1 1994/03/06 00:00:00 eric Exp $ */ +EOF printf "Hello\r\nWorld\r\n" > crlf a_crlf=`git-hash-object -w crlf` -- cgit v1.2.3 From 037b048eceafa129903d6327d3565c543f5895bb Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 May 2006 19:03:46 -0700 Subject: git-svn: remove assertion that broke with older versions of svn svn < 1.3.x would display changes to keywords lines as modified if they aren't expanded in the working copy. We already check for changes against the git tree here, so checking against the svn one is probably excessive. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- contrib/git-svn/git-svn.perl | 1 - 1 file changed, 1 deletion(-) (limited to 'contrib/git-svn') diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl index b3e0684c44..aac877974d 100755 --- a/contrib/git-svn/git-svn.perl +++ b/contrib/git-svn/git-svn.perl @@ -567,7 +567,6 @@ sub precommit_check { sub svn_checkout_tree { my ($svn_rev, $treeish) = @_; my $from = file_to_s("$REV_DIR/$svn_rev"); - assert_svn_wc_clean($svn_rev); assert_tree($from); print "diff-tree $from $treeish\n"; my $pid = open my $diff_fh, '-|'; -- cgit v1.2.3