From 74cfe6438fe0671c7443c88bb0b4edd68d5726bc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 30 Sep 2024 19:45:05 +0200 Subject: Adding upstream version 20240930. Signed-off-by: Daniel Baumann --- git/Makefile | 2 +- git/bin/git-checkout-branches | 2 +- git/bin/git-hook | 2 +- git/bin/git-pull-branches | 5 +++-- git/bin/git-remove-origin-branches | 2 +- git/bin/git-remove-origin-tags | 2 +- git/bin/git-repo-repack | 2 +- git/share/hooks/post-update.d/cgit-agefile | 2 +- git/share/hooks/post-update.d/git-update-server-info | 2 +- git/share/hooks/post-update.d/irker-notification | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) (limited to 'git') diff --git a/git/Makefile b/git/Makefile index 14db1ef..5871666 100644 --- a/git/Makefile +++ b/git/Makefile @@ -1,6 +1,6 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-checkout-branches b/git/bin/git-checkout-branches index dd04bb6..ba6efd1 100755 --- a/git/bin/git-checkout-branches +++ b/git/bin/git-checkout-branches @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-hook b/git/bin/git-hook index 81776ea..840f5f6 100755 --- a/git/bin/git-hook +++ b/git/bin/git-hook @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-pull-branches b/git/bin/git-pull-branches index aca1ea3..9e84041 100755 --- a/git/bin/git-pull-branches +++ b/git/bin/git-pull-branches @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # @@ -22,11 +22,12 @@ set -e CURRENT_BRANCH="$(git branch --show-current)" -REMOTE_BRANCHES="$(git branch -r | awk '{ print $1 }')" # pull current branch git pull +REMOTE_BRANCHES="$(git branch -r | awk '{ print $1 }')" + # pull remote branches for REMOTE_BRANCH in ${REMOTE_BRANCHES} do diff --git a/git/bin/git-remove-origin-branches b/git/bin/git-remove-origin-branches index de403ca..c687783 100755 --- a/git/bin/git-remove-origin-branches +++ b/git/bin/git-remove-origin-branches @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-remove-origin-tags b/git/bin/git-remove-origin-tags index 1de452f..1ccbacb 100755 --- a/git/bin/git-remove-origin-tags +++ b/git/bin/git-remove-origin-tags @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/bin/git-repo-repack b/git/bin/git-repo-repack index 035d55a..f78f40b 100755 --- a/git/bin/git-repo-repack +++ b/git/bin/git-repo-repack @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/share/hooks/post-update.d/cgit-agefile b/git/share/hooks/post-update.d/cgit-agefile index 4faafd6..1356924 100755 --- a/git/share/hooks/post-update.d/cgit-agefile +++ b/git/share/hooks/post-update.d/cgit-agefile @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/share/hooks/post-update.d/git-update-server-info b/git/share/hooks/post-update.d/git-update-server-info index c90015a..7cb8aa7 100755 --- a/git/share/hooks/post-update.d/git-update-server-info +++ b/git/share/hooks/post-update.d/git-update-server-info @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/git/share/hooks/post-update.d/irker-notification b/git/share/hooks/post-update.d/irker-notification index 8ef52ce..7d0d0da 100755 --- a/git/share/hooks/post-update.d/irker-notification +++ b/git/share/hooks/post-update.d/irker-notification @@ -2,7 +2,7 @@ # Open Infrastructure: service-tools -# Copyright (C) 2014-2023 Daniel Baumann +# Copyright (C) 2014-2024 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # -- cgit v1.2.3