mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-07-26 11:24:25 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update borg to v0.2.0-26-g2142794

Browse Source 
Also update the "bin/borg-bootstrap" script to take the ".hive-maint"
file into account as described in the Borg manual, and remove the
commentary because that is now covered in the Borg manual also.
This commit is contained in:
Jonas Bernoulli 2016-12-01 16:11:38 +01:00
parent 8e437d064e
commit 7b8939ea3e
3 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/.hive-maint
/var /var

39
bin/borg-bootstrap
View File

@ -5,37 +5,6 @@
# Author: Jonas Bernoulli <jonas@bernoul.li> # Author: Jonas Bernoulli <jonas@bernoul.li>
# License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt> # License: GPL v3 <https://www.gnu.org/licenses/gpl-3.0.txt>
# Commentary:
# This script is a replacement for `git submodule update'. The
# main differences are that this script resets the current branch
# if necessary instead of detaching HEAD and that it is capable of
# adding and configuring additional remotes.
# The following variables can be set in ".gitmodules":
#
# * submodule.DRONE.remote = NAME URL
#
# This variable specifies an additional remote named DRONE that is
# fetched from URL.
#
# * borg.collective = REMOTE
#
# This variable specifies the name used for remotes that reference
# a repository that has been patched by the collective. If a NAME
# matches REMOTE, then it is configured as the upstream of the
# current branch of the respective DRONE.
#
# * borg.pushDefault = DEFAULT
#
# This variable specifies a name used for push-remotes. If a NAME
# matches DEFAULT, then it is configured as the push-remote of the
# current branch of the respective DRONE.
# If an error occurs while `make bootstrap' runs this script, then
# fix the error(s) and run `bin/borg-bootstrap' directly, followed
# by `make build'.
hive_remote=$(git config -f .gitmodules borg.collective) hive_remote=$(git config -f .gitmodules borg.collective)
push_remote=$(git config -f .gitmodules borg.pushDefault) push_remote=$(git config -f .gitmodules borg.pushDefault)
@ -79,8 +48,14 @@ do
cd "$path" cd "$path"
if test "$remote" = "$hive_remote" if test "$remote" = "$hive_remote"
then then
if test -e "$toplevel/.hive-maint"
then
git config remote.pushDefault "$remote"
else
branch=$(git rev-parse --abbref-ref HEAD)
test -n "$branch" &&
git config branch.master.remote "$remote" git config branch.master.remote "$remote"
fi
elif test "$remote" = "$push_remote" elif test "$remote" = "$push_remote"
then then
git config remote.pushDefault "$remote" git config remote.pushDefault "$remote"

2
lib/borg

@ -1 +1 @@
Subproject commit a05b9bfdcdcfa5493a3e390afa2fde30cef421b4 Subproject commit 21427948db4839ea5ecb74f6421a36a9ab1f5f9b