Hello community, here is the log from the commit of package gitslave for openSUSE:Factory checked in at 2015-03-11 09:57:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gitslave (Old) and /work/SRC/openSUSE:Factory/.gitslave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gitslave" Changes: -------- --- /work/SRC/openSUSE:Factory/gitslave/gitslave.changes 2013-07-09 20:53:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gitslave.new/gitslave.changes 2015-03-11 09:57:51.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 3 13:05:22 UTC 2015 - robert.munte...@gmail.com + +- Added 0002-fix-gits-unexpected-status.patch , fixing 'gits status' + invocation on versions of git >= 1.8.5 + +------------------------------------------------------------------- New: ---- 0002-fix-gits-unexpected-status.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gitslave.spec ++++++ --- /var/tmp/diff_new_pack.7kNmul/_old 2015-03-11 09:57:52.000000000 +0100 +++ /var/tmp/diff_new_pack.7kNmul/_new 2015-03-11 09:57:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gitslave # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,8 @@ BuildArch: noarch # PATCH-FIX-UPSTREAM - git format-patch -1 0fc40b1e57f00acddd64ed88e44d28206f3682d6 Patch0: 0001-fix-inappropriate-REPO-substitution.patch +# PATCH-FIX-UPSTREAM - https://sourceforge.net/p/gitslave/bugs/19/ +Patch1: 0002-fix-gits-unexpected-status.patch %description Creates a group of related repositories—a superproject repository and @@ -51,6 +53,7 @@ %prep %setup -q %patch0 -p1 +%patch1 %build make %{?_smp_mflags} ++++++ 0002-fix-gits-unexpected-status.patch ++++++ Index: gits =================================================================== --- gits.orig +++ gits @@ -923,12 +923,7 @@ sub releasecheck($@) } my ($premove); - while ($msg =~ s/(^[^\#].*\n)//) - { - $premove .= $1; - } - - die "gits unexpected status output (missing branch): $msg" unless ($msg =~ s/^\# (?:On branch |(Not currently on any branch.))(.+)?\n//); + die "gits unexpected status output (missing branch): $msg" unless ($msg =~ s/^(?:# )?(?:On branch |Not currently on any branch.)(.+)?\n?//); my $localbranch = $2; if ($1 =~ /^Not/) { @@ -2714,12 +2709,7 @@ elsif ($ARGV[0] eq 'status') $okcnt++; my ($premove); - while ($msg =~ s/(^[^\#].*\n)//) - { - $premove .= $1; - } - - die "gits unexpected status output (missing branch): $msg" unless ($msg =~ s/^\# (?:On branch |Not currently on any branch.)(.+)?\n//); + die "gits unexpected status output (missing branch): $msg" unless ($msg =~ s/^(?:# )?(?:On branch |Not currently on any branch.)(.+)?\n?//); my $localbranch = $1 ? $1 : "(no branch)"; $branch = $localbranch unless ($branch); unless ($branch eq $localbranch) @@ -2870,12 +2860,7 @@ elsif ($ARGV[0] eq 'statuses') $okcnt++; my ($premove); - while ($msg =~ s/(^[^\#].*\n)//) - { - $premove .= $1; - } - - unless ($msg =~ s/^\# (?:On branch |Not currently on any branch.)(.+)?\n//) + unless ($msg =~ s/^(?:# )?(?:On branch |Not currently on any branch.)(.+)?\n?//) { # <TODO>some way for do_checkout to only operate on some slaves</TODO> $msg .= do_checkout(2, @oldbranch); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
