From 0fa4103185ff6f770897986b3ae4480f1e17649b90427a23915fb2e724b2a204 Mon Sep 17 00:00:00 2001 From: Olav Reinert Date: Wed, 16 Nov 2022 21:29:47 +0000 Subject: [PATCH] Accepting request 1036293 from home:oreinert:branches:utilities - Improve fix for build issue against Factory: * Replace git-protocol-file-allow.patch with git-config-for-tests.patch OBS-URL: https://build.opensuse.org/request/show/1036293 OBS-URL: https://build.opensuse.org/package/show/utilities/homeshick?expand=0&rev=19 --- git-config-for-tests.patch | 12 ++++ git-protocol-file-allow.patch | 100 ---------------------------------- homeshick.changes | 6 ++ homeshick.spec | 2 +- 4 files changed, 19 insertions(+), 101 deletions(-) create mode 100644 git-config-for-tests.patch delete mode 100644 git-protocol-file-allow.patch diff --git a/git-config-for-tests.patch b/git-config-for-tests.patch new file mode 100644 index 0000000..71703cc --- /dev/null +++ b/git-config-for-tests.patch @@ -0,0 +1,12 @@ +--- homeshick-2.0.0/test/helper.bash.orig 2022-11-16 22:11:08.095666823 +0100 ++++ homeshick-2.0.0/test/helper.bash 2022-11-16 22:12:58.279790390 +0100 +@@ -75,6 +75,9 @@ + mk_structure + # shellcheck source=homeshick.sh + source "$HOMESHICK_FN_SRC_SH" ++ ++ git config --global init.defaultBranch master ++ git config --global protocol.file.allow always + } + + function setup { diff --git a/git-protocol-file-allow.patch b/git-protocol-file-allow.patch deleted file mode 100644 index 477f41e..0000000 --- a/git-protocol-file-allow.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/lib/commands/clone.sh b/lib/commands/clone.sh -index a4e1c1b..4e8f10f 100644 ---- a/lib/commands/clone.sh -+++ b/lib/commands/clone.sh -@@ -22,16 +22,16 @@ function clone { - local git_out - version_compare "$GIT_VERSION" 1.6.5 - if [[ $? != 2 ]]; then -- git_out=$(git clone --recursive "$git_repo" "$repo_path" 2>&1) || \ -+ git_out=$(git -c protocol.file.allow=always clone --recursive "$git_repo" "$repo_path" 2>&1) || \ - err "$EX_SOFTWARE" "Unable to clone $git_repo. Git says:" "$git_out" - success - else -- git_out=$(git clone "$git_repo" "$repo_path" 2>&1) || \ -+ git_out=$(git -c protocol.file.allow=always clone "$git_repo" "$repo_path" 2>&1) || \ - err "$EX_SOFTWARE" "Unable to clone $git_repo. Git says:" "$git_out" - success - - pending 'submodules' "$git_repo" -- git_out=$(cd "$repo_path"; git submodule update --init 2>&1) || \ -+ git_out=$(cd "$repo_path"; git -c protocol.file.allow=always submodule update --init 2>&1) || \ - err "$EX_SOFTWARE" "Unable to clone submodules for $git_repo. Git says:" "$git_out" - success - fi -diff --git a/test/fixtures/dotfiles.sh b/test/fixtures/dotfiles.sh -index cd7442f..cc131d6 100644 ---- a/test/fixtures/dotfiles.sh -+++ b/test/fixtures/dotfiles.sh -@@ -75,7 +75,7 @@ EOF - ) - - cd "$dotfiles" -- git submodule add "$dotfiles_vim_submodule" home/.vim -+ git -c protocol.file.allow=always submodule add "$dotfiles_vim_submodule" home/.vim - git commit -m 'New vim configuration submodule' - } - -diff --git a/test/fixtures/module-files.sh b/test/fixtures/module-files.sh -index f4d2b6a..a14658a 100644 ---- a/test/fixtures/module-files.sh -+++ b/test/fixtures/module-files.sh -@@ -24,7 +24,7 @@ EOF - ) - - -- git submodule add "$my_module" -+ git -c protocol.file.allow=always submodule add "$my_module" - git commit -m 'my_module (git submodule) added for my new module-files repo' - - mkdir home -diff --git a/test/fixtures/nested-submodules.sh b/test/fixtures/nested-submodules.sh -index f821ecb..5eec1b5 100644 ---- a/test/fixtures/nested-submodules.sh -+++ b/test/fixtures/nested-submodules.sh -@@ -40,11 +40,11 @@ EOF - git commit -m 'Add info file for level2 repo' - ) - -- git submodule add "$level2" level2 -+ git -c protocol.file.allow=always submodule add "$level2" level2 - git commit -m 'level2 submodule added for level1' - ) - -- git submodule add "$level1" level1 -+ git -c protocol.file.allow=always submodule add "$level1" level1 - git commit -m 'level1 submodule added for level0' - - local home="$REPO_FIXTURES/home-for-nested-submodule" -@@ -84,15 +84,15 @@ EOF - git commit -m 'Add info file for subsub repo' - ) - -- git submodule add "$subsub" .subdir2 -+ git -c protocol.file.allow=always submodule add "$subsub" .subdir2 - git commit -m 'subsub submodule added for level2' - ) - -- git submodule add "$homesub" .subdir1 -+ git -c protocol.file.allow=always submodule add "$homesub" .subdir1 - git commit -m 'homesub submodule added for level1' - ) - -- git submodule add "$home" home -+ git -c protocol.file.allow=always submodule add "$home" home - git commit -m 'home submodule added for level0' - } - -diff --git a/test/fixtures/submodule-outside-home.sh b/test/fixtures/submodule-outside-home.sh -index af06798..bbdb2b4 100644 ---- a/test/fixtures/submodule-outside-home.sh -+++ b/test/fixtures/submodule-outside-home.sh -@@ -24,7 +24,7 @@ EOF - ) - - -- git submodule add "$the_submodule" -+ git -c protocol.file.allow=always submodule add "$the_submodule" - git commit -m 'the-submodule (git submodule) added for my new module-files repo' - - mkdir home diff --git a/homeshick.changes b/homeshick.changes index 76161ee..25bed50 100644 --- a/homeshick.changes +++ b/homeshick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 16 21:17:12 UTC 2022 - Olav Reinert + +- Improve fix for build issue against Factory: + * Replace git-protocol-file-allow.patch with git-config-for-tests.patch + ------------------------------------------------------------------- Fri Nov 11 21:45:19 UTC 2022 - Olav Reinert diff --git a/homeshick.spec b/homeshick.spec index f3a09bd..14439ca 100644 --- a/homeshick.spec +++ b/homeshick.spec @@ -27,7 +27,7 @@ Source0: https://github.com/andsens/homeshick/archive/v%{version}.tar.gz Source1: README-openSUSE.md Source99: homeshick.rpmlintrc Patch0: suse-packaging.patch -Patch1: git-protocol-file-allow.patch +Patch1: git-config-for-tests.patch BuildRequires: expect BuildRequires: git >= 1.5 BuildRequires: iputils