]> Savannah Git Hosting - gnulib.git/commit
gitsub.sh: For a submodule, merge from the right remote branch.
authorBruno Haible <bruno@clisp.org>
Fri, 16 Aug 2024 20:07:19 +0000 (22:07 +0200)
committerBruno Haible <bruno@clisp.org>
Fri, 16 Aug 2024 20:07:19 +0000 (22:07 +0200)
commite934b66f9c2075e424ac0e7c4f999b32b1687ec6
tree30c6a63b6abd80bb005867114ba877933b4766bd
parent5c73543760543bc5f9bac26bde512c9a09613e89
gitsub.sh: For a submodule, merge from the right remote branch.

Reported by Marc Nieper-Wißkirchen <marc.nieper+gnu@gmail.com> at
<https://lists.gnu.org/archive/html/bug-gnulib/2024-08/msg00101.html>.

* top/gitsub.sh (func_upgrade): For a submodule, use 'git branch' to
determine the branch to merge from, instead of assuming that it is
always the 'master' branch.
ChangeLog
top/gitsub.sh