From 89580e3f6d671102bd8a7dda5f28cbfae2356269 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 6 Sep 2005 09:06:32 -0700 Subject: [PATCH 1/3] Format fix for asciidoc documentation titles. Signed-off-by: Junio C Hamano --- Documentation/git-rename-script.txt | 3 +-- Documentation/git-repack-script.txt | 2 +- Documentation/git-send-email-script.txt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Documentation/git-rename-script.txt b/Documentation/git-rename-script.txt index 1abc68b7dd..b110525fca 100644 --- a/Documentation/git-rename-script.txt +++ b/Documentation/git-rename-script.txt @@ -1,6 +1,5 @@ - git-rename-script(1) -===================== +==================== v0.1, May 2005 NAME diff --git a/Documentation/git-repack-script.txt b/Documentation/git-repack-script.txt index cd449bcc2d..df94ec1ea7 100644 --- a/Documentation/git-repack-script.txt +++ b/Documentation/git-repack-script.txt @@ -1,5 +1,5 @@ git-repack-script(1) -===================== +==================== v0.99.5, August 2005 NAME diff --git a/Documentation/git-send-email-script.txt b/Documentation/git-send-email-script.txt index 9ad82cc3e4..f79ad19945 100644 --- a/Documentation/git-send-email-script.txt +++ b/Documentation/git-send-email-script.txt @@ -1,5 +1,5 @@ git-send-email-script(1) -======================= +======================== v0.1, July 2005 NAME From 0d821d4dab346c9891e937d5f10c3261e1bbf13a Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Tue, 6 Sep 2005 10:36:01 -0700 Subject: [PATCH 2/3] [PATCH] git-cvsimport-script: handling of tags This patch changes git-cvsimport-script so that it creates tag objects instead of refs to commits, and adds an option, -u, to convert underscores in branch and tag names to dots (since CVS doesn't allow dots in branches and tags.) Signed-off-by: Junio C Hamano --- Documentation/git-cvsimport-script.txt | 3 ++ git-cvsimport-script | 47 ++++++++++++++++++++------ 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt index d01a15d8a3..9d8acfcb13 100644 --- a/Documentation/git-cvsimport-script.txt +++ b/Documentation/git-cvsimport-script.txt @@ -44,6 +44,9 @@ OPTIONS to avoid noisy changesets. Highly recommended, but off by default to preserve compatibility with early imported trees. +-u:: + Convert underscores in tag and branch names to dots. + -o :: The 'HEAD' branch from CVS is imported to the 'origin' branch within the git repository, as 'HEAD' already has a special meaning for git. diff --git a/git-cvsimport-script b/git-cvsimport-script index e3a8e584a5..5079c79312 100755 --- a/git-cvsimport-script +++ b/git-cvsimport-script @@ -24,23 +24,24 @@ use Time::Local; use IO::Socket; use IO::Pipe; use POSIX qw(strftime dup2); +use IPC::Open2; $SIG{'PIPE'}="IGNORE"; $ENV{'TZ'}="UTC"; -our($opt_h,$opt_o,$opt_v,$opt_k,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i,$opt_s,$opt_m,$opt_M); +our($opt_h,$opt_o,$opt_v,$opt_k,$opt_u,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i,$opt_s,$opt_m,$opt_M); sub usage() { print STDERR <$git_dir/refs/tags/$tag") - or die "Cannot create tag $tag: $!\n"; - print C "$cid\n" - or die "Cannot write tag $branch: $!\n"; + my($in, $out) = ('',''); + my($xtag) = $tag; + $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** + $xtag =~ tr/_/\./ if ( $opt_u ); + + my $pid = open2($in, $out, 'git-mktag'); + print $out "object $cid\n". + "type commit\n". + "tag $xtag\n". + "tagger $author <$author>\n" + or die "Cannot create tag object $xtag: $!\n"; + close($out) + or die "Cannot create tag object $xtag: $!\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 $xtag: $!\n"; + } + + + open(C,">$git_dir/refs/tags/$xtag") + or die "Cannot create tag $xtag: $!\n"; + print C "$tagobj\n" + or die "Cannot write tag $xtag: $!\n"; close(C) - or die "Cannot write tag $branch: $!\n"; - print "Created tag '$tag' on '$branch'\n" if $opt_v; + or die "Cannot write tag $xtag: $!\n"; + + print "Created tag '$xtag' on '$branch'\n" if $opt_v; } }; From 760b6634461ded0a9f09e86388c0ad7500641f1e Mon Sep 17 00:00:00 2001 From: Rene Scharfe Date: Tue, 6 Sep 2005 21:21:16 +0200 Subject: [PATCH 3/3] [PATCH] Update documentation for git-get-tar-commit-id ... and add a copyright notice. [jc: also move its entry in git.txt from undocumented section.] Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- Documentation/git-get-tar-commit-id.txt | 23 +++++++++++------------ Documentation/git.txt | 5 ++--- get-tar-commit-id.c | 3 +++ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Documentation/git-get-tar-commit-id.txt b/Documentation/git-get-tar-commit-id.txt index f9c4140d3d..0eb5e2889c 100644 --- a/Documentation/git-get-tar-commit-id.txt +++ b/Documentation/git-get-tar-commit-id.txt @@ -3,25 +3,24 @@ git-get-tar-commit-id(1) NAME ---- -git-get-tar-commit-id - Some git command not yet documented. +git-get-tar-commit-id - Extract commit ID from an archive created using git-tar-tree. SYNOPSIS -------- -'git-get-tar-commit-id' [ --option ] ... +'git-get-tar-commit-id' < + DESCRIPTION ----------- -Does something not yet documented. - - -OPTIONS -------- ---option:: - Some option not yet documented. - -...:: - Some argument not yet documented. +Acts as a filter, extracting the commit ID stored in archives created by +git-tar-tree. It reads only the first 1024 bytes of input, thus its +runtime is not influenced by the size of very much. + +If no commit ID is found, git-get-tar-commit-id quietly exists with a +return code of 1. This can happen if had not been created +using git-tar-tree or if the first parameter of git-tar-tree had been +a tree ID instead of a commit ID or tag. Author diff --git a/Documentation/git.txt b/Documentation/git.txt index 0bcd99027d..b10edffe48 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -319,6 +319,8 @@ link:git-patch-id.html[git-patch-id]:: link:git-send-email-script.html[git-send-email]:: Send patch e-mails out of "format-patch --mbox" output. +link:git-get-tar-commit-id.html[git-get-tar-commit-id]:: + Extract commit ID from an archive created using git-tar-tree. Commands not yet documented --------------------------- @@ -338,9 +340,6 @@ link:git-diff-script.html[git-diff-script]:: link:git-format-patch-script.html[git-format-patch-script]:: git-format-patch-script. -link:git-get-tar-commit-id.html[git-get-tar-commit-id]:: - git-get-tar-commit-id. - link:git-request-pull-script.html[git-request-pull-script]:: git-request-pull-script. diff --git a/get-tar-commit-id.c b/get-tar-commit-id.c index a1a17e53d2..416629035c 100644 --- a/get-tar-commit-id.c +++ b/get-tar-commit-id.c @@ -1,3 +1,6 @@ +/* + * Copyright (C) 2005 Rene Scharfe + */ #include #include #include