]> 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 12:30:48 +0000 (14:30 +0200)
commitcd4a88cc81afa9e2d830ad6105df1de7539a4889
treea6b7874b0f2039759016450188b8cbdeea63050a
parentdfb7dda0cdadcbb96be3e3be53d6c3a636667ab9
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