Changeset 1389 for trunk/locker


Ignore:
Timestamp:
Dec 23, 2009, 12:11:32 PM (15 years ago)
Author:
ezyang
Message:
Make git describe more resilient, and prune .scripts-version when .scripts exists.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/locker/sbin/parallel-find.pl

    r1388 r1389  
    5858    my $dirname = shift;
    5959    $uid = stat($dirname)->uid;
    60     open my $h, "sudo -u#$uid git --git-dir=$dirname/.git describe --tags 2>/dev/null |";
     60    open my $h, "sudo -u#$uid git --git-dir=$dirname/.git describe --tags --always 2>/dev/null |";
    6161    chomp($val = <$h>);
    6262    if (! $val) {
     
    7878        if (! $new_style) {
    7979            $f =~ s!/\.scripts-version$!!;
     80            # Don't use .scripts-version of .scripts is around!
     81            if (-d "$f/.scripts") {
     82                next;
     83            }
    8084        }
    8185        if (! updatable($f)) {
Note: See TracChangeset for help on using the changeset viewer.