From: "Dave O'Neill" <dmo@roaringpenguin.com>
To: git@vger.kernel.org
Cc: "Dave O'Neill" <dmo@roaringpenguin.com>
Subject: [PATCH] Generate tags with correct timestamp (git-svnimport)
Date: Thu, 21 Jun 2007 17:48:56 -0400 [thread overview]
Message-ID: <11824625361092-git-send-email-dmo@roaringpenguin.com> (raw)
In-Reply-To: <7vzm2u3tov.fsf@assigned-by-dhcp.pobox.com>
Now uses git-tag instead of manually constructing the tag. This gives us a
correct timestamp, removes some crufty code, and makes it work the same as
git-cvsimport.
The generated tags are now lightweight tags instead of tag objects, which may
or may not be the behaviour we want.
Also, remove two unused variables from git-cvsimport.
---
git-cvsimport.perl | 1 -
git-svnimport.perl | 24 ++----------------------
2 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 433b7fd..69ccb88 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -774,7 +774,6 @@ sub commit {
or die "Cannot write branch $branch for update: $!\n";
if ($tag) {
- my ($in, $out) = ('','');
my ($xtag) = $tag;
$xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
$xtag =~ tr/_/\./ if ( $opt_u );
diff --git a/git-svnimport.perl b/git-svnimport.perl
index f459762..32832ad 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl
@@ -868,33 +868,13 @@ sub commit {
}
if($tag) {
- my($in, $out) = ('','');
$last_rev = "-" if %$changed_paths;
# the tag was 'complex', i.e. did not refer to a "real" revision
$dest =~ tr/_/\./ if $opt_u;
- $branch = $dest;
-
- my $pid = open2($in, $out, 'git-mktag');
- print $out ("object $cid\n".
- "type commit\n".
- "tag $dest\n".
- "tagger $committer_name <$committer_email> 0 +0000\n") and
- close($out)
- or die "Cannot create tag object $dest: $!\n";
-
- my $tagobj = <$in>;
- chomp $tagobj;
-
- if ( !close($in) or waitpid($pid, 0) != $pid or
- $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
- die "Cannot create tag object $dest: $!\n";
- }
- open(C,">$git_dir/refs/tags/$dest") and
- print C ("$tagobj\n") and
- close(C)
- or die "Cannot create tag $branch: $!\n";
+ system('git-tag', $dest, $cid) == 0
+ or die "Cannot create tag $dest: $!\n";
print "Created tag '$dest' on '$branch'\n" if $opt_v;
}
--
1.5.2.2.239.g89630
prev parent reply other threads:[~2007-06-21 21:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-21 2:15 [PATCH] Set correct date for tags Dave O'Neill
2007-06-21 2:52 ` Junio C Hamano
2007-06-21 21:48 ` Dave O'Neill [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11824625361092-git-send-email-dmo@roaringpenguin.com \
--to=dmo@roaringpenguin.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).