Git.pm: tentative fix to test the freshly built Git.pm

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index be2a48cf65949ba16b354e476dd39f5c334f1b25..e8fad02e757506e423b05b4a37fe3df8dba87ab2 100755 (executable)
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -5,8 +5,10 @@
 # Read .git/FETCH_HEAD and make a human readable merge message
 # by grouping branches and tags together to form a single line.
 
+unshift @INC, '@@INSTLIBDIR@@';
 use strict;
 use Git;
+use Error qw(:try);
 
 my $repo = Git->repository();
 
@@ -31,7 +33,17 @@ sub andjoin {
 }
 
 sub repoconfig {
-       my ($val) = $repo->command_oneline('repo-config', '--get', 'merge.summary');
+       my $val;
+       try {
+               $val = $repo->command_oneline('repo-config', '--get', 'merge.summary');
+       } catch Git::Error::Command with {
+               my ($E) = shift;
+               if ($E->value() == 1) {
+                       return undef;
+               } else {
+                       throw $E;
+               }
+       };
        return $val;
 }