nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Switch NHtext from "git branch" to "git symbolic-ref" to avoid corner cases.

Browse Source
This commit is contained in:
keni
2015-03-01 20:26:29 -05:00
parent a609bda996
commit 774e6c2f6f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DEVEL/hooksdir/NHtext
View File

@@ -12,9 +12,6 @@ use strict;
#my $dbgfile = ($^O eq "MSWin32") ? "$ENV{TEMP}.$$" : "/tmp/trace.$$"; #my $dbgfile = ($^O eq "MSWin32") ? "$ENV{TEMP}.$$" : "/tmp/trace.$$";
#open TRACE, ">>", ($debug==0)? $sink : $dbgfile; #open TRACE, ">>", ($debug==0)? $sink : $dbgfile;
# pick up the prefix for substitutions in this repo
#my $PREFIX = `git config --local --get nethack.substprefix`;
#chomp($PREFIX);
sub git_config { sub git_config {
my($section, $var) = @_; my($section, $var) = @_;
local($_); local($_);
@@ -30,6 +27,7 @@ sub git_config {
} }
die "Missing config var: [$section] $var\n"; die "Missing config var: [$section] $var\n";
} }
# pick up the prefix for substitutions in this repo
my $PREFIX = &git_config('nethack','substprefix'); my $PREFIX = &git_config('nethack','substprefix');
my $submode = 0; # ok to make non-cleaning changes to file my $submode = 0; # ok to make non-cleaning changes to file
@@ -119,16 +117,17 @@ sub Date {
#sub Author { #sub Author {
#} #}
# NB: the standard-ish Revision line isn't enough - you need Branch/Revision - # NB: the standard-ish Revision line isn't enough - you need Branch:Revision -
# but we split it into 2 so we can use the standard processing code on Revision # but we split it into 2 so we can use the standard processing code on Revision
# and just slip Branch in. # and just slip Branch in.
sub Branch { sub Branch {
my($val, $mode, $submode) = @_; my($val, $mode, $submode) = @_;
if($mode eq "c"){ if($mode eq "c"){
if($submode==0){ if($submode==0){
$val = `git branch --no-color --contains`; $val = `git symbolic-ref -q --short HEAD`;
$val =~ s/[\n\r]*$//; $val =~ s/[\n\r]*$//;
$val =~ s/^\*\s*//; $val =~ s/^\*\s*//;
$val = "(unknown)" unless($val =~ m/^[[:print:]]+$/);
} }
} }
# if($mode eq "s"){ # if($mode eq "s"){