]> 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>
Tue, 17 Sep 2024 10:21:02 +0000 (12:21 +0200)
commit3ee5d54fa96fa5e12ff6fcfcbd8ec24311ae76aa
tree1b5cac9ad2044a7aa82c7e6892f7cea3d19b2493
parenta9346f4c61af6b7724bd0b0003c18395f7424de8
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