diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-30 00:09:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-30 00:09:59 -0700 |
| commit | 62b693a0705c55dbc5573946f1f3fc6175cd2620 (patch) | |
| tree | cb9f0c9c22aca3edce3d6a25aaf56b3c36c197f0 /contrib/git-svn | |
| parent | Merge branch 'jc/lt-tree-n-cache-tree' into next (diff) | |
| parent | send-email: do not pass bogus address to local sendmail binary (diff) | |
| download | tgif-62b693a0705c55dbc5573946f1f3fc6175cd2620.tar.xz | |
Merge branch 'master' into next
* master:
send-email: do not pass bogus address to local sendmail binary
Add a basic test case for git send-email, and fix some real bugs discovered.
Fix a bug in email extraction used in git-send-email.
Add support for --bcc to git-send-email.
git-send-email: Add References: headers to emails, in addition to In-Reply-To:
git-clean fails on files beginning with a dash
git-svn: remove assertion that broke with older versions of svn
git-svn: t0001: workaround a heredoc bug in old versions of dash
Documentation: fix a tutorial-2 typo
Documentation: retitle the git-core tutorial
documentation: add brief mention of cat-file to tutorial part I
documentation: mention gitk font adjustment in tutorial
Fix some documentation typoes
Diffstat (limited to 'contrib/git-svn')
| -rwxr-xr-x | contrib/git-svn/git-svn.perl | 1 | ||||
| -rw-r--r-- | contrib/git-svn/t/t0001-contrib-git-svn-props.sh | 3 |
2 files changed, 2 insertions, 2 deletions
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, '-|'; 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` |