From 4ad4515dfe15bec59ede5d526c2794bd30b04d86 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 9 Jul 2006 20:20:48 -0700 Subject: [PATCH] git-svn: fix --file/-F option in commit-diff Also, allow messages from tags to be used as commit messages. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- git-svn.perl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index 145eaa865..f04e26993 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -760,7 +760,7 @@ sub commit_diff { exit 1; } if (defined $_file) { - $_message = file_to_s($_message); + $_message = file_to_s($_file); } else { $_message ||= get_commit_message($tb, "$GIT_DIR/.svn-commit.tmp.$$")->{msg}; @@ -1518,12 +1518,12 @@ sub get_commit_message { open my $msg, '>', $commit_msg or croak $!; chomp(my $type = `git-cat-file -t $commit`); - if ($type eq 'commit') { + if ($type eq 'commit' || $type eq 'tag') { my $pid = open my $msg_fh, '-|'; defined $pid or croak $!; if ($pid == 0) { - exec(qw(git-cat-file commit), $commit) or croak $!; + exec('git-cat-file', $type, $commit) or croak $!; } my $in_msg = 0; while (<$msg_fh>) { -- 2.26.2