#26 gitslave 2.0.2 fails with git-2.6.1

[Mark E. Hamilton]

We recently encountered an error with eg when we upgraded to git-2.6.1 due to the fact that the ouptut format of git changed from 1.7.1 to 2.6.1. We are now encountering a similar issue with gitslave:

% gits --version
gits version 2.0.2
git version 1.7.1
Perl v5.10.1 (*) built for x86_64-linux-thread-multi
% git status
# On branch master
nothing to commit (working directory clean)
%
% module load sierra-git/2.6.1
% gits --version
gits version 2.0.2
git version 2.6.1
Perl v5.10.1 (*) built for x86_64-linux-thread-multi
% gits status
gits unexpected status output (missing branch):  : at /scratch/repos_test/gitslave-2.0.2/gits line 2720.

I believe that this is due to the fact that git status returns different text with the new version:

% git --version
git version 1.7.1
% git status
# On branch master
nothing to commit (working directory clean)

% git --version
git version 2.6.1
% git status
On branch master
Your branch is based on 'origin/master', but the upstream is gone.
  (use "git branch --unset-upstream" to fixup)
nothing to commit, working directory clean

I am not familiar enought with Perl to fix this, but it does make gitslave unusable for us. Thanks.

[Mark E. Hamilton]

Sorry, I messed up my example. Here's the corrected example

% gits --version
gits version 2.0.2
git version 1.7.1
Perl v5.10.1 (*) built for x86_64-linux-thread-multi
% gits status
# On branch master
%
% module load sierra-git/2.6.1
% gits --version
gits version 2.0.2
git version 2.6.1
Perl v5.10.1 (*) built for x86_64-linux-thread-multi
% gits status
gits unexpected status output (missing branch):  : at /scratch/repos_test/gitslave-2.0.2/gits line 2720.
%

[Baka Project]

Ticket 18 has an unofficial patch for this (unofficial because it doesn't handle it the right way, but it works good enough for people to muddle through).

https://sourceforge.net/p/gitslave/bugs/18/

[Joel Purra]

See also this fork (by me), which implement some of the basic patches and works pretty well: https://github.com/joelpurra/gitslave