Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package git-subrepo for openSUSE:Factory
checked in at 2023-05-18 15:19:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/git-subrepo (Old)
and /work/SRC/openSUSE:Factory/.git-subrepo.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-subrepo"
Thu May 18 15:19:28 2023 rev:4 rq:1087710 version:0.4.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/git-subrepo/git-subrepo.changes 2022-12-05
18:01:12.092581709 +0100
+++ /work/SRC/openSUSE:Factory/.git-subrepo.new.1533/git-subrepo.changes
2023-05-18 15:19:34.321944908 +0200
@@ -1,0 +2,6 @@
+Wed May 17 15:40:22 UTC 2023 - Tina Müller <tina.muel...@suse.com>
+
+- Update to 0.4.6:
+ * Removes stale worktrees after using the push command
+
+-------------------------------------------------------------------
Old:
----
0.4.5.tar.gz
New:
----
0.4.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ git-subrepo.spec ++++++
--- /var/tmp/diff_new_pack.q9ReWh/_old 2023-05-18 15:19:34.825947998 +0200
+++ /var/tmp/diff_new_pack.q9ReWh/_new 2023-05-18 15:19:34.833948047 +0200
@@ -1,7 +1,7 @@
#
# spec file for package git-subrepo
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: git-subrepo
-Version: 0.4.5
+Version: 0.4.6
Release: 0
Summary: Git Submodule Alternative
License: MIT
++++++ 0.4.5.tar.gz -> 0.4.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-subrepo-0.4.5/.github/workflows/test.yml
new/git-subrepo-0.4.6/.github/workflows/test.yml
--- old/git-subrepo-0.4.5/.github/workflows/test.yml 2022-09-23
05:38:10.000000000 +0200
+++ new/git-subrepo-0.4.6/.github/workflows/test.yml 2023-04-21
17:31:08.000000000 +0200
@@ -18,7 +18,6 @@
- if: startsWith(matrix.os, 'macos')
run: brew install bash
- run:
- git checkout -B git-actions-ci-dummy-branch;
git config --global user.email "y...@example.com";
git config --global user.name "Your Name";
- run: make test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-subrepo-0.4.5/Changes
new/git-subrepo-0.4.6/Changes
--- old/git-subrepo-0.4.5/Changes 2022-09-23 05:38:10.000000000 +0200
+++ new/git-subrepo-0.4.6/Changes 2023-04-21 17:31:08.000000000 +0200
@@ -1,4 +1,8 @@
---
+version: 0.4.6
+date: Fri 21 Apr 2023 10:18:34 AM EST
+- Remove stale worktrees in the push command
+---
version: 0.4.5
date: Thu 22 Sep 2022 23:03:24 PM EST
- Add --file option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-subrepo-0.4.5/Meta new/git-subrepo-0.4.6/Meta
--- old/git-subrepo-0.4.5/Meta 2022-09-23 05:38:10.000000000 +0200
+++ new/git-subrepo-0.4.6/Meta 2023-04-21 17:31:08.000000000 +0200
@@ -1,11 +1,11 @@
=meta: 0.0.2
name: git-subrepo
-version: 0.4.5
+version: 0.4.6
abstract: Git Submodule Alternative
homepage: https://github.com/ingydotnet/git-subrepo#readme
license: MIT
-copyright: 2013-2022
+copyright: 2013-2023
author:
name: Ingy döt Net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-subrepo-0.4.5/lib/git-subrepo
new/git-subrepo-0.4.6/lib/git-subrepo
--- old/git-subrepo-0.4.5/lib/git-subrepo 2022-09-23 05:38:10.000000000
+0200
+++ new/git-subrepo-0.4.6/lib/git-subrepo 2023-04-21 17:31:08.000000000
+0200
@@ -30,7 +30,7 @@
bash+:import :std can version-check
-VERSION=0.4.5
+VERSION=0.4.6
REQUIRED_BASH_VERSION=4.0
REQUIRED_GIT_VERSION=2.7.0
GIT_TMP=$(git rev-parse --git-common-dir 2> /dev/null || echo .git)/tmp
@@ -616,6 +616,8 @@
fi
branch_name=subrepo/$subref
+ # We must make sure that a stale worktree is removed as well
+ worktree=$GIT_TMP/$branch_name
git:delete-branch "$branch_name"
if $squash_wanted; then
@@ -654,6 +656,10 @@
new_upstream_head_commit=$(git rev-parse "$branch_name")
if ! $new_upstream; then
if [[ $upstream_head_commit == "$new_upstream_head_commit" ]]; then
+ if $branch_created; then
+ o "Remove branch '$branch_name'."
+ git:delete-branch "$branch_name"
+ fi
OK=false
CODE=-2
return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-subrepo-0.4.5/test/push-after-push-no-changes.t
new/git-subrepo-0.4.6/test/push-after-push-no-changes.t
--- old/git-subrepo-0.4.5/test/push-after-push-no-changes.t 1970-01-01
01:00:00.000000000 +0100
+++ new/git-subrepo-0.4.6/test/push-after-push-no-changes.t 2023-04-21
17:31:08.000000000 +0200
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+subrepo-clone-bar-into-foo
+
+{
+ message=$(
+ cd "$OWNER/foo"
+ git subrepo push bar > /dev/null
+ add-new-files bar/Bar1
+ catch git subrepo push bar
+ )
+
+ is "$message" \
+ "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
+ "Output OK: Check that 'push' after an empty push works."
+}
+
+done_testing 1
+
+teardown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-subrepo-0.4.5/test/status.t
new/git-subrepo-0.4.6/test/status.t
--- old/git-subrepo-0.4.5/test/status.t 2022-09-23 05:38:10.000000000 +0200
+++ new/git-subrepo-0.4.6/test/status.t 2023-04-21 17:31:08.000000000 +0200
@@ -6,27 +6,44 @@
use Test::More
+clone-foo-and-bar
+
+(
+ cd $OWNER/foo
+ git subrepo clone ../../../$UPSTREAM/bar
+ git subrepo clone ../../../$UPSTREAM/foo bar/foo
+ mkdir lib
+ git subrepo clone ../../../$UPSTREAM/bar lib/bar
+ git subrepo clone ../../../$UPSTREAM/foo lib/bar/foo
+) &> /dev/null || die
+
{
- output=$(git subrepo status)
+ output=$(
+ cd $OWNER/foo
+ git subrepo status
+ )
like "$output" "2 subrepos:" \
"'status' intro ok"
- like "$output" "Git subrepo 'ext/bashplus':" \
- "ext/bashplus is in 'status'"
+ like "$output" "Git subrepo 'bar':" \
+ "bar is in 'status'"
- like "$output" "Git subrepo 'ext/test-more-bash':" \
- "ext/test-more-bash is in 'status'"
+ like "$output" "Git subrepo 'lib/bar':" \
+ "lib/bar is in 'status'"
- unlike "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
- "ext/test-more-bash/ext/bashplus is not in 'status'"
+ unlike "$output" "Git subrepo 'bar/foo':" \
+ "bar/foo is not in 'status'"
- unlike "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
- "ext/test-more-bash/ext/test-tap-bash is not in 'status'"
+ unlike "$output" "Git subrepo 'lib/bar/foo':" \
+ "lib/bar/foo is not in 'status'"
}
{
- output=$(git subrepo status --ALL)
+ output=$(
+ cd $OWNER/foo
+ git subrepo status --all-recursive
+ )
like "$output" "4 subrepos:" \
"'status --ALL' intro ok"
