* Re: [PATCH] Revert "gitweb: Time::HiRes is in core for Perl 5.8"
2012-01-27 17:45 0% ` [PATCH] Revert "gitweb: Time::HiRes is in core for Perl 5.8" Jakub Narebski
@ 2012-01-29 2:21 0% ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 14+ results
From: Ævar Arnfjörð Bjarmason @ 2012-01-29 2:21 UTC (permalink / raw)
To: Jakub Narebski; +Cc: Hallvard Breien Furuseth, git
On Fri, Jan 27, 2012 at 18:45, Jakub Narebski <jnareb@gmail.com> wrote:
> On Mon, 23 Jan 2012, Ævar Arnfjörð Bjarmason wrote:
>> On Mon, Jan 23, 2012 at 05:50, Hallvard Breien Furuseth <h.b.furuseth@usit.uio.no> wrote:
>> >
>> > t9500-gitweb-standalone-no-errors fails: Git 1.7.9.rc2/1.7.8.4, RHEL
>> > 6.2, Perl 5.10.1. Reverting 3962f1d756ab41c1d180e35483d1c8dffe51e0d1
>> > fixes it. The commit expects Time::HiRes to be present, but RedHat
>> > has split it out to a separate RPM perl-Time-HiRes. Better add a
>> > comment about that, so it doesn't get re-reverted.
>> >
>> > Or pacify the test and expect gitweb@RHEL-users to install the RPM:
> [...]
>
>> This doesn't actually fix the issue, it only sweeps it under the rug
>> by making the tests pass, gitweb will still fail to compile on Red
>> Hat once installed.
>
> I think you meant "fail to run" here.
I mean fail to compile, "use" statements are executed at compile time,
if it was a "require" outside of BEGIN-time it would fail at runtime.
I realize though that you probably thought I meant fail in Git's
Makefile-driven compilation phase, but no, it'll install just fine,
however the perl interpreter won't compile it.
>> I think the right solution is to partially revert
>> 3962f1d756ab41c1d180e35483d1c8dffe51e0d1, but add a comment in the
>> code indicating that it's to deal with RedHat's broken fork of Perl.
>
> I have added comment in commit message, but not in code. I wonder if
> it would be enough.
>
>> However even if it's required in an eval it might still fail at
>> runtime in the reset_timer() function, which'll need to deal with it
>> too.
>
> It shouldn't; everything else related to timer is protected with
> 'if defined $t0', which is false if Time::HiRes module is not available.
Correct, I didn't look carefully enough.
^ permalink raw reply [relevance 0%]
* [PATCH] Revert "gitweb: Time::HiRes is in core for Perl 5.8"
2012-01-23 9:42 0% ` Ævar Arnfjörð Bjarmason
2012-01-27 9:18 0% ` Jakub Narębski
2012-01-27 10:15 0% ` Hallvard B Furuseth
@ 2012-01-27 17:45 0% ` Jakub Narebski
2012-01-29 2:21 0% ` Ævar Arnfjörð Bjarmason
2 siblings, 1 reply; 14+ results
From: Jakub Narebski @ 2012-01-27 17:45 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: Hallvard Breien Furuseth, git
On Mon, 23 Jan 2012, Ævar Arnfjörð Bjarmason wrote:
> On Mon, Jan 23, 2012 at 05:50, Hallvard Breien Furuseth <h.b.furuseth@usit.uio.no> wrote:
> >
> > t9500-gitweb-standalone-no-errors fails: Git 1.7.9.rc2/1.7.8.4, RHEL
> > 6.2, Perl 5.10.1. Reverting 3962f1d756ab41c1d180e35483d1c8dffe51e0d1
> > fixes it. The commit expects Time::HiRes to be present, but RedHat
> > has split it out to a separate RPM perl-Time-HiRes. Better add a
> > comment about that, so it doesn't get re-reverted.
> >
> > Or pacify the test and expect gitweb@RHEL-users to install the RPM:
[...]
> This doesn't actually fix the issue, it only sweeps it under the rug
> by making the tests pass, gitweb will still fail to compile on Red
> Hat once installed.
I think you meant "fail to run" here.
> I think the right solution is to partially revert
> 3962f1d756ab41c1d180e35483d1c8dffe51e0d1, but add a comment in the
> code indicating that it's to deal with RedHat's broken fork of Perl.
I have added comment in commit message, but not in code. I wonder if
it would be enough.
> However even if it's required in an eval it might still fail at
> runtime in the reset_timer() function, which'll need to deal with it
> too.
It shouldn't; everything else related to timer is protected with
'if defined $t0', which is false if Time::HiRes module is not available.
Here is the patch
-- >8 --
From: Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH] Revert "gitweb: Time::HiRes is in core for Perl 5.8"
This reverts commit 3962f1d756ab41c1d180e35483d1c8dffe51e0d1.
Though Time::HiRes is a core Perl module, it doesn't necessarily mean
that it is included in 'perl' package, and that it is installed if
Perl is installed.
For example RedHat has split it out to a separate RPM perl-Time-HiRes.
Noticed-by: Hallvard Breien Furuseth <h.b.furuseth@usit.uio.no>
Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Jakub Narębski <jnareb@gmail.com>
---
gitweb/gitweb.perl | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index abb5a79..c86224a 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -17,10 +17,12 @@ use Encode;
use Fcntl ':mode';
use File::Find qw();
use File::Basename qw(basename);
-use Time::HiRes qw(gettimeofday tv_interval);
binmode STDOUT, ':utf8';
-our $t0 = [ gettimeofday() ];
+our $t0;
+if (eval { require Time::HiRes; 1; }) {
+ $t0 = [Time::HiRes::gettimeofday()];
+}
our $number_of_git_cmds = 0;
BEGIN {
@@ -1142,7 +1144,7 @@ sub dispatch {
}
sub reset_timer {
- our $t0 = [ gettimeofday() ]
+ our $t0 = [Time::HiRes::gettimeofday()]
if defined $t0;
our $number_of_git_cmds = 0;
}
@@ -3974,7 +3976,7 @@ sub git_footer_html {
print "<div id=\"generating_info\">\n";
print 'This page took '.
'<span id="generating_time" class="time_span">'.
- tv_interval($t0, [ gettimeofday() ]).
+ Time::HiRes::tv_interval($t0, [Time::HiRes::gettimeofday()]).
' seconds </span>'.
' and '.
'<span id="generating_cmd">'.
@@ -6253,7 +6255,7 @@ sub git_blame_common {
print 'END';
if (defined $t0 && gitweb_check_feature('timed')) {
print ' '.
- tv_interval($t0, [ gettimeofday() ]).
+ Time::HiRes::tv_interval($t0, [Time::HiRes::gettimeofday()]).
' '.$number_of_git_cmds;
}
print "\n";
--
1.7.6
^ permalink raw reply related [relevance 0%]
* Re: Test t9500 fails if Time::HiRes is missing
2012-01-27 10:15 0% ` Hallvard B Furuseth
@ 2012-01-27 10:59 0% ` Jakub Narębski
0 siblings, 0 replies; 14+ results
From: Jakub Narębski @ 2012-01-27 10:59 UTC (permalink / raw)
To: Hallvard B Furuseth; +Cc: Ævar Arnfjörð Bjarmason, git
On Fri, Jan 27, 2012 at 11:15 AM, Hallvard B Furuseth
<h.b.furuseth@usit.uio.no> wrote:
> On Mon, 23 Jan 2012 10:42:02 +0100, Ævar Arnfjörð Bjarmason
> <avarab@gmail.com> wrote:
>>
>> On Mon, Jan 23, 2012 at 05:50, Hallvard Breien Furuseth
>> <h.b.furuseth@usit.uio.no> wrote:
>>>
>>> Or pacify the test and expect gitweb@RHEL-users to install the RPM:
>>>
>>> --- git-1.7.9.rc2/t/gitweb-lib.sh~
>>> +++ git-1.7.9.rc2/t/gitweb-lib.sh
>>> @@ -113,4 +113,9 @@
>>> test_done
>>> }
>>>
>>> +perl -MTime::HiRes -e 0 >/dev/null 2>&1 || {
>>> + skip_all='skipping gitweb tests, Time::HiRes module not available'
>>> + test_done
>>> +}
>>> +
>>> gitweb_init
>>
>>
>> [Adding Jakub to CC]
>>
>> This doesn't actually fix the issue, it only sweeps it under the rug
>> by making the tests pass, gitweb will still fail to compile on Red
>> Hat once installed.
>
>
> Is that relevant? gitweb-lib.sh already has code to pass the tests if
> Encode, CGI, CGI::Util or CGI::Carp are missing. I just added another.
The difference is that:
1.) Time::HiRes is a core Perl module, so theoretically it should be always
installed.
2.) Time::HiRes is not really required for gitweb to work, only for optional
feature (timing information).
--
Jakub Narebski
^ permalink raw reply [relevance 0%]
* Re: Test t9500 fails if Time::HiRes is missing
2012-01-23 9:42 0% ` Ævar Arnfjörð Bjarmason
2012-01-27 9:18 0% ` Jakub Narębski
@ 2012-01-27 10:15 0% ` Hallvard B Furuseth
2012-01-27 10:59 0% ` Jakub Narębski
2012-01-27 17:45 0% ` [PATCH] Revert "gitweb: Time::HiRes is in core for Perl 5.8" Jakub Narebski
2 siblings, 1 reply; 14+ results
From: Hallvard B Furuseth @ 2012-01-27 10:15 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: git, Jakub Narebski
On Mon, 23 Jan 2012 10:42:02 +0100, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> On Mon, Jan 23, 2012 at 05:50, Hallvard Breien Furuseth
> <h.b.furuseth@usit.uio.no> wrote:
>> Or pacify the test and expect gitweb@RHEL-users to install the RPM:
>>
>> --- git-1.7.9.rc2/t/gitweb-lib.sh~
>> +++ git-1.7.9.rc2/t/gitweb-lib.sh
>> @@ -113,4 +113,9 @@
>> test_done
>> }
>>
>> +perl -MTime::HiRes -e 0 >/dev/null 2>&1 || {
>> + skip_all='skipping gitweb tests, Time::HiRes module not
>> available'
>> + test_done
>> +}
>> +
>> gitweb_init
>
> [Adding Jakub to CC]
>
> This doesn't actually fix the issue, it only sweeps it under the rug
> by making the tests pass, gitweb will still fail to compile on Red
> Hat once installed.
Is that relevant? gitweb-lib.sh already has code to pass the tests if
Encode, CGI, CGI::Util or CGI::Carp are missing. I just added another.
--
Hallvard
^ permalink raw reply [relevance 0%]
* Re: Test t9500 fails if Time::HiRes is missing
2012-01-23 9:42 0% ` Ævar Arnfjörð Bjarmason
@ 2012-01-27 9:18 0% ` Jakub Narębski
2012-01-27 10:15 0% ` Hallvard B Furuseth
2012-01-27 17:45 0% ` [PATCH] Revert "gitweb: Time::HiRes is in core for Perl 5.8" Jakub Narebski
2 siblings, 0 replies; 14+ results
From: Jakub Narębski @ 2012-01-27 9:18 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: Hallvard Breien Furuseth, git
On Mon, Jan 23, 2012 at 10:42 AM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> On Mon, Jan 23, 2012 at 05:50, Hallvard Breien Furuseth <h.b.furuseth@usit.uio.no> wrote:
>>
>> t9500-gitweb-standalone-no-errors fails: Git 1.7.9.rc2/1.7.8.4, RHEL
>> 6.2, Perl 5.10.1. Reverting 3962f1d756ab41c1d180e35483d1c8dffe51e0d1
>> fixes it. The commit expects Time::HiRes to be present, but RedHat
>> has split it out to a separate RPM perl-Time-HiRes. Better add a
>> comment about that, so it doesn't get re-reverted.
>>
>> Or pacify the test and expect gitweb@RHEL-users to install the RPM:
>>
>> --- git-1.7.9.rc2/t/gitweb-lib.sh~
>> +++ git-1.7.9.rc2/t/gitweb-lib.sh
>> @@ -113,4 +113,9 @@
>> test_done
>> }
>>
>> +perl -MTime::HiRes -e 0 >/dev/null 2>&1 || {
>> + skip_all='skipping gitweb tests, Time::HiRes module not available'
>> + test_done
>> +}
>> +
>> gitweb_init
>
> [Adding Jakub to CC]
>
> This doesn't actually fix the issue, it only sweeps it under the rug
> by making the tests pass, gitweb will still fail to compile on Red
> Hat once installed.
>
> I think the right solution is to partially revert
> 3962f1d756ab41c1d180e35483d1c8dffe51e0d1, but add a comment in the
> code indicating that it's to deal with RedHat's broken fork of Perl.
>
> However even if it's required in an eval it might still fail at
> runtime in the reset_timer() function, which'll need to deal with it
> too.
I'll try to send a fix today. Time::HiRes is needed only for optional timing
info.
--
Jakub Narebski
^ permalink raw reply [relevance 0%]
* Re: [ANNOUNCE] Git 1.7.9.rc2
2012-01-24 18:11 9% ` Junio C Hamano
@ 2012-01-25 21:38 8% ` fREW Schmidt
0 siblings, 0 replies; 14+ results
From: fREW Schmidt @ 2012-01-25 21:38 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Tue, Jan 24, 2012 at 12:11 PM, Junio C Hamano <gitster@pobox.com> wrote:
> fREW Schmidt <frioux@gmail.com> writes:
>
>> On Wed, Jan 18, 2012 at 7:16 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>> * gitk updates accumulated since early 2011.
>>
>> Where might one go to find more detail on this one?
>
> Hmm, http://git.kernel.org/?p=git/git.git;a=shortlog, perhaps?
Ah, I actually looked there before but for some reason didn't see the
latest merge. If anyone else cares:
$ git log v1.7.9-rc2 ^v1.7.8 -- gitk-git/
commit 09bb4eb4f14c0b92baa649b2b97cda2390b84b84
Merge: 10f4eb6 811c70f
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 16 22:18:42 2011 -0800
Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk:
gitk: Make vi-style keybindings more vi-like
gitk: Make "touching paths" search support backslashes
gitk: Show modified files with separate work tree
gitk: Simplify calculation of gitdir
gitk: Run 'git rev-parse --git-dir' only once
gitk: Put temporary directory inside .git
gitk: Fix "External diff" with separate work tree
gitk: Fix "blame parent commit" with separate work tree
gitk: Fix "show origin of this line" with separate work tree
gitk: Fix file highlight when run in subdirectory
gitk: Update copyright
gitk: When a commit contains a note, mark it with a yellow box
gitk: Remember time zones from author and commit timestamps
gitk: Remove unused $cdate array
--
fREW Schmidt
http://blog.afoolishmanifesto.com
^ permalink raw reply [relevance 8%]
* Re: [ANNOUNCE] Git 1.7.9.rc2
2012-01-24 16:16 9% ` fREW Schmidt
@ 2012-01-24 18:11 9% ` Junio C Hamano
2012-01-25 21:38 8% ` fREW Schmidt
0 siblings, 1 reply; 14+ results
From: Junio C Hamano @ 2012-01-24 18:11 UTC (permalink / raw)
To: fREW Schmidt; +Cc: git
fREW Schmidt <frioux@gmail.com> writes:
> On Wed, Jan 18, 2012 at 7:16 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> * gitk updates accumulated since early 2011.
>
> Where might one go to find more detail on this one?
Hmm, http://git.kernel.org/?p=git/git.git;a=shortlog, perhaps?
^ permalink raw reply [relevance 9%]
* Re: [ANNOUNCE] Git 1.7.9.rc2
2012-01-19 1:16 14% [ANNOUNCE] Git 1.7.9.rc2 Junio C Hamano
@ 2012-01-24 16:16 9% ` fREW Schmidt
2012-01-24 18:11 9% ` Junio C Hamano
0 siblings, 1 reply; 14+ results
From: fREW Schmidt @ 2012-01-24 16:16 UTC (permalink / raw)
To: git, Linux Kernel
On Wed, Jan 18, 2012 at 7:16 PM, Junio C Hamano <gitster@pobox.com> wrote:
> * gitk updates accumulated since early 2011.
Where might one go to find more detail on this one?
--
fREW Schmidt
http://blog.afoolishmanifesto.com
^ permalink raw reply [relevance 9%]
* Re: Test t9500 fails if Time::HiRes is missing
2012-01-23 4:50 6% Test t9500 fails if Time::HiRes is missing Hallvard Breien Furuseth
@ 2012-01-23 9:42 0% ` Ævar Arnfjörð Bjarmason
2012-01-27 9:18 0% ` Jakub Narębski
` (2 more replies)
0 siblings, 3 replies; 14+ results
From: Ævar Arnfjörð Bjarmason @ 2012-01-23 9:42 UTC (permalink / raw)
To: Hallvard Breien Furuseth; +Cc: git, Jakub Narebski
On Mon, Jan 23, 2012 at 05:50, Hallvard Breien Furuseth
<h.b.furuseth@usit.uio.no> wrote:
> t9500-gitweb-standalone-no-errors fails: Git 1.7.9.rc2/1.7.8.4, RHEL
> 6.2, Perl 5.10.1. Reverting 3962f1d756ab41c1d180e35483d1c8dffe51e0d1
> fixes it. The commit expects Time::HiRes to be present, but RedHat
> has split it out to a separate RPM perl-Time-HiRes. Better add a
> comment about that, so it doesn't get re-reverted.
>
> Or pacify the test and expect gitweb@RHEL-users to install the RPM:
>
> --- git-1.7.9.rc2/t/gitweb-lib.sh~
> +++ git-1.7.9.rc2/t/gitweb-lib.sh
> @@ -113,4 +113,9 @@
> test_done
> }
>
> +perl -MTime::HiRes -e 0 >/dev/null 2>&1 || {
> + skip_all='skipping gitweb tests, Time::HiRes module not available'
> + test_done
> +}
> +
> gitweb_init
[Adding Jakub to CC]
This doesn't actually fix the issue, it only sweeps it under the rug
by making the tests pass, gitweb will still fail to compile on Red
Hat once installed.
I think the right solution is to partially revert
3962f1d756ab41c1d180e35483d1c8dffe51e0d1, but add a comment in the
code indicating that it's to deal with RedHat's broken fork of Perl.
However even if it's required in an eval it might still fail at
runtime in the reset_timer() function, which'll need to deal with it
too.
^ permalink raw reply [relevance 0%]
* Test t9500 fails if Time::HiRes is missing
@ 2012-01-23 4:50 6% Hallvard Breien Furuseth
2012-01-23 9:42 0% ` Ævar Arnfjörð Bjarmason
0 siblings, 1 reply; 14+ results
From: Hallvard Breien Furuseth @ 2012-01-23 4:50 UTC (permalink / raw)
To: git
t9500-gitweb-standalone-no-errors fails: Git 1.7.9.rc2/1.7.8.4, RHEL
6.2, Perl 5.10.1. Reverting 3962f1d756ab41c1d180e35483d1c8dffe51e0d1
fixes it. The commit expects Time::HiRes to be present, but RedHat
has split it out to a separate RPM perl-Time-HiRes. Better add a
comment about that, so it doesn't get re-reverted.
Or pacify the test and expect gitweb@RHEL-users to install the RPM:
--- git-1.7.9.rc2/t/gitweb-lib.sh~
+++ git-1.7.9.rc2/t/gitweb-lib.sh
@@ -113,4 +113,9 @@
test_done
}
+perl -MTime::HiRes -e 0 >/dev/null 2>&1 || {
+ skip_all='skipping gitweb tests, Time::HiRes module not available'
+ test_done
+}
+
gitweb_init
--
Hallvard
^ permalink raw reply [relevance 6%]
* Re: Checkout tag?
2012-01-22 17:08 0% ` Jonathan Nieder
@ 2012-01-22 17:33 0% ` Magnus Bäck
0 siblings, 0 replies; 14+ results
From: Magnus Bäck @ 2012-01-22 17:33 UTC (permalink / raw)
To: Jonathan Nieder
Cc: Magnus Bäck, Abscissa, git, Jakub Narebski,
Nguyen Thai Ngoc Duy
On Sunday, January 22, 2012 at 18:08 CET,
Jonathan Nieder <jrnieder@gmail.com> wrote:
> Magnus Bäck wrote:
>
> > Looking at an up to date Git 1.7.9-rc2 man page, it still seems
> > slightly inconsistent with itself. The synopsis at the top says
> >
> > git checkout [-p|--patch] [<tree-ish>] [--] [<paths>...]
> >
> > while the text in the DESCRIPTION section says
> >
> > git checkout [-p|--patch] [<tree-ish>] [--] <pathspec>...
>
> Hmm, my copy says:
>
> SYNOPSIS
>
> git checkout [-q] [-f] [-m] [<branch>]
> git checkout [-q] [-f] [-m] [--detach] [<commit>]
> git checkout [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
> git checkout [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
> git checkout [-p|--patch] [<tree-ish>] [--] [<paths>...]
Perhaps I wasn't clear -- I didn't mean that the synopsis *only* listed
the form in my original quote above.
> DESCRIPTION
>
> ... overview ...
>
> git checkout [<branch>], git checkout -b|-B <new_branch> [<start point>],
> git checkout [--detach] [<commit>]
>
> This form switches branches by updating the index, working
> tree, and HEAD...
>
> git checkout [-p|--patch] [<tree-ish>] [--] <pathspec>...
>
> When <paths> or --patch are given, git checkout does not
> switch branches. It updates the named paths...
>
> So in the synopsis it lists five forms, and in the description section
> it lists two forms, the first of which has three variants.
>
> It's not immediately obvious to me which inconsistency you are
> pointing to as a source of confusion. Could you elaborate,
> preferably with suggested wording for a fix?
I simply meant that
git checkout [-p|--patch] [<tree-ish>] [--] [<paths>...]
git checkout [-p|--patch] [<tree-ish>] [--] <pathspec>...
aren't identical even though I assume they describe the exact same
scenario. The first command synopsis makes it clear that paths are
optional while the second indicates that at least one path must be
specified (unless "..." means "zero, one, or more occurences").
Also, "paths" != "pathspec".
> If you can do so in the form of a patch, all the better. ;-)
Sure, but it won't be during the coming week. Not that the patch is
terribly difficult to prepare but because I need legal approval to
submit it, and it's not clear I'll have time to deal with all that
during my last week at work.
--
Magnus Bäck Opinions are my own and do not necessarily
SW Configuration Manager represent the ones of my employer, etc.
Sony Ericsson
^ permalink raw reply [relevance 0%]
* Re: Checkout tag?
2012-01-22 11:31 6% ` Magnus Bäck
@ 2012-01-22 17:08 0% ` Jonathan Nieder
2012-01-22 17:33 0% ` Magnus Bäck
0 siblings, 1 reply; 14+ results
From: Jonathan Nieder @ 2012-01-22 17:08 UTC (permalink / raw)
To: Magnus Bäck; +Cc: Abscissa, git, Jakub Narebski, Nguyen Thai Ngoc Duy
Hi,
Magnus Bäck wrote:
> Looking at an up to date Git 1.7.9-rc2 man page, it still seems
> slightly inconsistent with itself. The synopsis at the top says
>
> git checkout [-p|--patch] [<tree-ish>] [--] [<paths>...]
>
> while the text in the DESCRIPTION section says
>
> git checkout [-p|--patch] [<tree-ish>] [--] <pathspec>...
Hmm, my copy says:
SYNOPSIS
git checkout [-q] [-f] [-m] [<branch>]
git checkout [-q] [-f] [-m] [--detach] [<commit>]
git checkout [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
git checkout [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
git checkout [-p|--patch] [<tree-ish>] [--] [<paths>...]
DESCRIPTION
... overview ...
git checkout [<branch>], git checkout -b|-B <new_branch> [<start point>],
git checkout [--detach] [<commit>]
This form switches branches by updating the index, working
tree, and HEAD...
git checkout [-p|--patch] [<tree-ish>] [--] <pathspec>...
When <paths> or --patch are given, git checkout does not
switch branches. It updates the named paths...
So in the synopsis it lists five forms, and in the description section
it lists two forms, the first of which has three variants.
It's not immediately obvious to me which inconsistency you are
pointing to as a source of confusion. Could you elaborate, preferably
with suggested wording for a fix? If you can do so in the form of a
patch, all the better. ;-)
Thanks,
Jonathan
^ permalink raw reply [relevance 0%]
* Re: Checkout tag?
@ 2012-01-22 11:31 6% ` Magnus Bäck
2012-01-22 17:08 0% ` Jonathan Nieder
0 siblings, 1 reply; 14+ results
From: Magnus Bäck @ 2012-01-22 11:31 UTC (permalink / raw)
To: Abscissa; +Cc: git
On Sunday, January 22, 2012 at 11:25 CET,
Abscissa <bus_nabble_git@semitwist.com> wrote:
> I saw that, but it seems to imply that it's not a simple:
>
> >git checkout tag_name
>
> because of the required <pathspec>, whatever that is.
It isn't required. The part of the manual that I quoted (from Git
1.7.2.5) indicated that the pathspec is mandatory, but looking at
the command synopsis at the top of the man page it's actually listed
as optional.
Looking at an up to date Git 1.7.9-rc2 man page, it still seems
slightly inconsistent with itself. The synopsis at the top says
git checkout [-p|--patch] [<tree-ish>] [--] [<paths>...]
while the text in the DESCRIPTION section says
git checkout [-p|--patch] [<tree-ish>] [--] <pathspec>...
The DETACHED HEAD section of the man page contains an example of
checking out a tag, by the way.
If you're doubtful, why don't you just create a tag and try things
out for yourself?
--
Magnus Bäck Opinions are my own and do not necessarily
SW Configuration Manager represent the ones of my employer, etc.
Sony Ericsson
^ permalink raw reply [relevance 6%]
* [ANNOUNCE] Git 1.7.9.rc2
@ 2012-01-19 1:16 14% Junio C Hamano
2012-01-24 16:16 9% ` fREW Schmidt
0 siblings, 1 reply; 14+ results
From: Junio C Hamano @ 2012-01-19 1:16 UTC (permalink / raw)
To: git; +Cc: Linux Kernel
A release candidate Git 1.7.9.rc2 is available for testing.
The release tarballs are found at:
http://code.google.com/p/git-core/downloads/list
and their SHA-1 checksums are:
4eeaaf8a73006f797e6c23455097684664bf256e git-1.7.9.rc2.tar.gz
22aad76c146abe04e8f9bd89b2fbf4b575f434ce git-htmldocs-1.7.9.rc2.tar.gz
8565f64f6227fcfba3f768dabdcd9d6037f08842 git-manpages-1.7.9.rc2.tar.gz
Also the following public repositories all have a copy of the v1.7.9.rc2
tag and the master branch that the tag points at:
url = git://repo.or.cz/alt-git.git
url = https://code.google.com/p/git-core/
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git
Git v1.7.9 Release Notes (draft)
========================
Updates since v1.7.8
--------------------
* gitk updates accumulated since early 2011.
* git-gui updated to 0.16.0.
* git-p4 (in contrib/) updates.
* Git uses gettext to translate its most common interface messages
into the user's language if translations are available and the
locale is appropriately set. Distributors can drop in new PO files
in po/ to add new translations.
* The code to handle username/password for HTTP transaction used in
"git push" & "git fetch" learned to talk "credential API" to
external programs to cache or store them, to allow integration with
platform native keychain mechanisms.
* The prompted input in the terminal use our own getpass() replacement
when possible. HTTP transactions used to ask username without echoing
back what was typed, but with this change you will see it as you type.
* The internal of "revert/cherry-pick" has been tweaked to prepare
building more generic "sequencer" on top of the implementation that
drives them.
* "git rev-parse FETCH_HEAD" after "git fetch" without specifying
what to fetch from the command line will now show the commit that
would be merged if the command were "git pull".
* "git add" learned to stream large files directly into a packfile
instead of writing them into individual loose object files.
* "git checkout -B <current branch> <elsewhere>" is a more intuitive
way to spell "git reset --keep <elsewhere>".
* "git checkout" and "git merge" learned "--no-overwrite-ignore" option
to tell Git that untracked and ignored files are not expendable.
* "git commit --amend" learned "--no-edit" option to say that the
user is amending the tree being recorded, without updating the
commit log message.
* "git commit" and "git reset" re-learned the optimization to prime
the cache-tree information in the index, which makes it faster to
write a tree object out after the index entries are updated.
* "git commit" detects and rejects an attempt to stuff NUL byte in
the commit log message.
* "git commit" learned "-S" to GPG-sign the commit; this can be shown
with the "--show-signature" option to "git log".
* fsck and prune are relatively lengthy operations that still go
silent while making the end-user wait. They learned to give progress
output like other slow operations.
* The set of built-in function-header patterns for various languages
knows MATLAB.
* "git log --format='<format>'" learned new %g[nNeE] specifiers to
show information from the reflog entries when warlking the reflog
(i.e. with "-g").
* "git pull" can be used to fetch and merge an annotated/signed tag,
instead of the tip of a topic branch. The GPG signature from the
signed tag is recorded in the resulting merge commit for later
auditing.
* "git log" learned "--show-signature" option to show the signed tag
that was merged that is embedded in the merge commit. It also can
show the signature made on the commit with "git commit -S".
* "git branch --edit-description" can be used to add descriptive text
to explain what a topic branch is about.
* "git fmt-merge-msg" learned to take the branch description into
account when preparing a merge summary that "git merge" records
when merging a local branch.
* "git request-pull" has been updated to convey more information
useful for integrators to decide if a topic is worth merging and
what is pulled is indeed what the requestor asked to pull,
including:
- the tip of the branch being requested to be merged;
- the branch description describing what the topic is about;
- the contents of the annotated tag, when requesting to pull a tag.
* "git pull" learned to notice 'pull.rebase' configuration variable,
which serves as a global fallback for setting 'branch.<name>.rebase'
configuration variable per branch.
* "git tag" learned "--cleanup" option to control how the whitespaces
and empty lines in tag message are cleaned up.
* "gitweb" learned to show side-by-side diff.
Also contains minor documentation updates and code clean-ups.
Fixes since v1.7.8
------------------
Unless otherwise noted, all the fixes since v1.7.8 in the maintenance
releases are contained in this release (see release notes to them for
details).
----------------------------------------------------------------
Changes since v1.7.9-rc1 are as follows:
Jakub Narebski (2):
gitweb: Fix file links in "grep" search
gitweb: Harden "grep" search against filenames with ':'
Jeff King (3):
unix-socket: handle long socket pathnames
credential-cache: report more daemon connection errors
credential-cache: ignore "connection refused" errors
Jonathan Nieder (1):
unix-socket: do not let close() or chdir() clobber errno during cleanup
Junio C Hamano (4):
pulling signed tag: add howto document
Git 1.7.7.6
Git 1.7.8.4
Git 1.7.9-rc2
Michael Haggerty (2):
git-show-ref: fix escaping in asciidoc source
git-show-ref doc: typeset regexp in fixed width font
Nguyễn Thái Ngọc Duy (3):
Document limited recursion pathspec matching with wildcards
diff-index: enable recursive pathspec matching in unpack_trees
diff-index: enable recursive pathspec matching in unpack_trees
Thomas Rast (1):
word-diff: ignore '\ No newline at eof' marker
^ permalink raw reply [relevance 14%]
Results 1-14 of 14 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2012-01-19 1:16 14% [ANNOUNCE] Git 1.7.9.rc2 Junio C Hamano
2012-01-24 16:16 9% ` fREW Schmidt
2012-01-24 18:11 9% ` Junio C Hamano
2012-01-25 21:38 8% ` fREW Schmidt
2012-01-22 10:05 Checkout tag? Abscissa
2012-01-22 10:11 ` Magnus Bäck
2012-01-22 10:25 ` Abscissa
2012-01-22 11:31 6% ` Magnus Bäck
2012-01-22 17:08 0% ` Jonathan Nieder
2012-01-22 17:33 0% ` Magnus Bäck
2012-01-23 4:50 6% Test t9500 fails if Time::HiRes is missing Hallvard Breien Furuseth
2012-01-23 9:42 0% ` Ævar Arnfjörð Bjarmason
2012-01-27 9:18 0% ` Jakub Narębski
2012-01-27 10:15 0% ` Hallvard B Furuseth
2012-01-27 10:59 0% ` Jakub Narębski
2012-01-27 17:45 0% ` [PATCH] Revert "gitweb: Time::HiRes is in core for Perl 5.8" Jakub Narebski
2012-01-29 2:21 0% ` Ævar Arnfjörð Bjarmason
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).