From 00b29467f74723366194d8208048a82af2a28d0f Mon Sep 17 00:00:00 2001
From: Norbert Preining <preining@logic.at>
Date: Sat, 6 May 2017 11:20:06 +0000
Subject: fix TLREE from_git to properly report revisions

git-svn-id: svn://tug.org/texlive/trunk@44221 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/tlpkg/TeXLive/TLTREE.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Master/tlpkg/TeXLive/TLTREE.pm')

diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index 8676008937d..016bb3623ed 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -80,7 +80,7 @@ sub init_from_git {
   my %files;
   my @lines;
 
-  my @foo = `cd $svnroot; git log --pretty=format:COMMIT=%h --name-only --diff-filter=A`;
+  my @foo = `cd $svnroot; git log --pretty=format:COMMIT=%h --name-only`;
   if ($retval != 0) {
     $retval /= 256 if $retval > 0;
     tldie("TLTree: git log in $svnroot returned $retval, stopping.\n");
@@ -97,7 +97,9 @@ sub init_from_git {
       $rev++;
       next;
     } else {
-      $files{$l} = $rev;
+      # we only use the first occurrence of $f from the top,
+      # that is the most recent change
+      $files{$l} = $rev if (not(defined($files{$l})));
     }
   }
 
@@ -114,7 +116,7 @@ sub init_from_git {
 sub init_from_gitsvn {
   my $self = shift;
   my $svnroot = $self->{'svnroot'};
-  my @foo = `cd $svnroot; git log --pretty=format:%h --name-only --diff-filter=A`;
+  my @foo = `cd $svnroot; git log --pretty=format:%h --name-only`;
   chomp(@foo);
   my $retval = $?;
   if ($retval != 0) {
-- 
cgit v1.2.3