vagrant-host-ruby-provisioner 0.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.bundle/install.log +12 -0
- data/.git/COMMIT_EDITMSG +1 -0
- data/.git/HEAD +1 -0
- data/.git/ORIG_HEAD +1 -0
- data/.git/config +27 -0
- data/.git/description +1 -0
- data/.git/hooks/applypatch-msg.sample +15 -0
- data/.git/hooks/commit-msg.sample +24 -0
- data/.git/hooks/post-update.sample +8 -0
- data/.git/hooks/pre-applypatch.sample +14 -0
- data/.git/hooks/pre-commit.sample +50 -0
- data/.git/hooks/pre-push.sample +53 -0
- data/.git/hooks/pre-rebase.sample +169 -0
- data/.git/hooks/prepare-commit-msg.sample +36 -0
- data/.git/hooks/update.sample +128 -0
- data/.git/index +0 -0
- data/.git/info/exclude +7 -0
- data/.git/logs/HEAD +18 -0
- data/.git/logs/refs/heads/develop +4 -0
- data/.git/logs/refs/heads/master +4 -0
- data/.git/logs/refs/remotes/origin/develop +3 -0
- data/.git/logs/refs/remotes/origin/master +3 -0
- data/.git/objects/00/385de4f2cdb2e486b6162bbe9ceded2c9de149 +1 -0
- data/.git/objects/03/f4640282277137d9bff1ae8bfd5c50b8f1b79e +0 -0
- data/.git/objects/0d/fac130eb7cd831a6c056873e8d3ae6e93db247 +0 -0
- data/.git/objects/17/6265de4604f414741fe76371e449f593f8e7e0 +0 -0
- data/.git/objects/1d/43f8617a54edcc57b5b02ee1956171da1afd2d +0 -0
- data/.git/objects/1d/55088d625004cf0b00afa24f6d88a1992a4778 +0 -0
- data/.git/objects/1d/5b6a20fb8954dcd21ad80985e9520a252e6443 +0 -0
- data/.git/objects/25/57c3fa0ae631f74274be056151490b240c9a0a +0 -0
- data/.git/objects/30/53454fe8ce25790fb0bb99e085aed05f0920c9 +0 -0
- data/.git/objects/30/779ce66452022e68bebf3f8c6716ad9eef9746 +0 -0
- data/.git/objects/30/b44d51f49285fc5c34905762dfb49992343598 +0 -0
- data/.git/objects/32/fc82fdb3ff19b7afdaa78ce1a6f3a3f30c530c +0 -0
- data/.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 +0 -0
- data/.git/objects/55/0d25559ab84450f3bc26d2d2159e0f19e73cd2 +0 -0
- data/.git/objects/55/f27b4e0562bd804d51d0c83cd4385e30ddb7f3 +0 -0
- data/.git/objects/67/a3df946ed797186f1349a38a64dc02be463a20 +0 -0
- data/.git/objects/68/54f995c5a57f12a51148f7253b405a4954a011 +3 -0
- data/.git/objects/74/2a7893188658eaea4c183b85395472b3c90a50 +2 -0
- data/.git/objects/7f/52326cb8789f02f486204842303c65473aff91 +0 -0
- data/.git/objects/80/5263aed3f51ee4f45aa2dfe70f8375c76900c9 +1 -0
- data/.git/objects/83/7a0f9b2ba6864e9c9cfe79fc4e065d025a6977 +2 -0
- data/.git/objects/84/65a30d41d07431151abd14c431740e085b8dd8 +3 -0
- data/.git/objects/87/aece6195369cd5db35a0f63f08a497803ff59c +0 -0
- data/.git/objects/8a/0185b31c54fa56c2c4d68f40b132872fe60cde +0 -0
- data/.git/objects/8c/54268d4e578d8fa7773eacdf5367d422db3e63 +2 -0
- data/.git/objects/8d/e4cc20aa245c38ceed209618adc89ee4f35a9e +0 -0
- data/.git/objects/9e/b9957255bd6dd91bcf94dd08138fef5a819385 +0 -0
- data/.git/objects/a0/3c75b8391d082613b8e060afc753d8e344e033 +1 -0
- data/.git/objects/a6/b93ec58569d60b55136a7ff3f5f576916e303c +0 -0
- data/.git/objects/aa/254936cd0c3b115468fc688267d10a1ca43378 +0 -0
- data/.git/objects/ad/48deb220c14f264ea31ae345163f53434a4a89 +1 -0
- data/.git/objects/ad/b67e5e55e7e83c9bd369b1a48905ad54385aa4 +0 -0
- data/.git/objects/b3/afe9e6b095dad2904d7cc30ac0890495143045 +0 -0
- data/.git/objects/b4/82d4d6bf6c28b1195c0397f64361c9efff3053 +1 -0
- data/.git/objects/cb/4945b0775afb714f0f6f1fe5fc53ad5daf8985 +1 -0
- data/.git/objects/cd/ba5d86517b00e0066b9790ff3f763b23c7fceb +0 -0
- data/.git/objects/df/a83063026d1177200981794e135a1e8843e56a +0 -0
- data/.git/objects/e6/d9282cbc0f6e454fa60414622c725d46e13a14 +0 -0
- data/.git/objects/f2/38b8c3ab87fafb8cd3643b3fe5b89cb19aabfb +0 -0
- data/.git/refs/heads/develop +1 -0
- data/.git/refs/heads/master +1 -0
- data/.git/refs/remotes/origin/develop +1 -0
- data/.git/refs/remotes/origin/master +1 -0
- data/.git/refs/tags/v0.0.1 +1 -0
- data/.git/refs/tags/v0.0.1-hotfix-small-update-001 +1 -0
- data/.git/refs/tags/v0.0.2 +1 -0
- data/.gitignore +4 -0
- data/Gemfile +9 -0
- data/Gemfile.lock +41 -0
- data/LICENSE +9 -0
- data/README.md +43 -0
- data/Rakefile +9 -0
- data/lib/vagrant-host-ruby-provisioner/config.rb +46 -0
- data/lib/vagrant-host-ruby-provisioner/info.rb +9 -0
- data/lib/vagrant-host-ruby-provisioner/plugin.rb +41 -0
- data/lib/vagrant-host-ruby-provisioner/provisioner.rb +21 -0
- data/lib/vagrant-host-ruby-provisioner/version.rb +5 -0
- data/lib/vagrant-host-ruby-provisioner.rb +14 -0
- data/locales/en.rb +15 -0
- data/vagrant-host-ruby-provisioner.gemspec +83 -0
- metadata +167 -0
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 1a5ad2d271af393d98459f9154588d1b2d81464d
|
4
|
+
data.tar.gz: aa757e28a328fe88a29b8a7dee2ca6878a9e5a41
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: 9814878a4f3e9cb734d84dc0de0d980359790247c5b987e53c283c7bd430d53153254a46bb0e770c3ecd8a40bd0e74fd3ff6b11228f2e3641be3f1d8fb8921f2
|
7
|
+
data.tar.gz: de24b2ea27891406d1eed78fe57afdeaf16d916cd95a74029fb0519d749af7c6b14ab25bccddae9497c76bf03856475187211bb5258ad3cd2921e67c9dbd85a0
|
data/.bundle/install.log
ADDED
@@ -0,0 +1,12 @@
|
|
1
|
+
# Logfile created on 2014-01-12 02:12:43 -0500 by logger.rb/36483
|
2
|
+
I, [2014-01-12T02:12:43.486224 #66589] INFO -- : 0: rake (10.1.1) from /Library/Ruby/Gems/2.0.0/specifications/rake-10.1.1.gemspec
|
3
|
+
I, [2014-01-12T02:12:43.487473 #66589] INFO -- : 0: bundler (1.5.1) from /Library/Ruby/Gems/2.0.0/specifications/bundler-1.5.1.gemspec
|
4
|
+
I, [2014-01-12T02:12:43.506166 #66589] INFO -- : 0: ffi (1.9.3) from /Library/Ruby/Gems/2.0.0/specifications/ffi-1.9.3.gemspec
|
5
|
+
I, [2014-01-12T02:12:43.508075 #66589] INFO -- : 0: childprocess (0.3.9) from /Library/Ruby/Gems/2.0.0/specifications/childprocess-0.3.9.gemspec
|
6
|
+
I, [2014-01-12T02:12:43.508721 #66589] INFO -- : 0: erubis (2.7.0) from /Library/Ruby/Gems/2.0.0/specifications/erubis-2.7.0.gemspec
|
7
|
+
I, [2014-01-12T02:12:43.509280 #66589] INFO -- : 0: i18n (0.6.9) from /Library/Ruby/Gems/2.0.0/specifications/i18n-0.6.9.gemspec
|
8
|
+
I, [2014-01-12T02:12:43.510151 #66589] INFO -- : 0: log4r (1.1.10) from /Library/Ruby/Gems/2.0.0/specifications/log4r-1.1.10.gemspec
|
9
|
+
I, [2014-01-12T02:12:43.510654 #66589] INFO -- : 0: net-ssh (2.7.0) from /Library/Ruby/Gems/2.0.0/specifications/net-ssh-2.7.0.gemspec
|
10
|
+
I, [2014-01-12T02:12:43.511157 #66589] INFO -- : 0: net-scp (1.1.2) from /Library/Ruby/Gems/2.0.0/specifications/net-scp-1.1.2.gemspec
|
11
|
+
I, [2014-01-12T02:12:45.255861 #66589] INFO -- : 0: vagrant (1.5.0.dev) from /Library/Ruby/Gems/2.0.0/bundler/gems/vagrant-a241c9ac5940/vagrant.gemspec
|
12
|
+
I, [2014-01-12T02:12:45.379457 #66589] INFO -- : 0: vagrant-host-ruby-provisioner (0.0.2) from /Users/jonathanmarvens/Projects/software/jebbit/vagrant-ruby-provisioner/vagrant-host-ruby-provisioner.gemspec
|
data/.git/COMMIT_EDITMSG
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
You piss me off RubyGems.
|
data/.git/HEAD
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
ref: refs/heads/develop
|
data/.git/ORIG_HEAD
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
742a7893188658eaea4c183b85395472b3c90a50
|
data/.git/config
ADDED
@@ -0,0 +1,27 @@
|
|
1
|
+
[core]
|
2
|
+
repositoryformatversion = 0
|
3
|
+
filemode = true
|
4
|
+
bare = false
|
5
|
+
logallrefupdates = true
|
6
|
+
ignorecase = true
|
7
|
+
precomposeunicode = false
|
8
|
+
[gitflow "branch"]
|
9
|
+
master = master
|
10
|
+
develop = develop
|
11
|
+
[gitflow "prefix"]
|
12
|
+
feature = feature/
|
13
|
+
release = release/
|
14
|
+
hotfix = hotfix/
|
15
|
+
support = support/
|
16
|
+
versiontag = v
|
17
|
+
[user]
|
18
|
+
email = jonathan.barronville@jebbit.com
|
19
|
+
[remote "origin"]
|
20
|
+
url = git@github.com:jebbit/vagrant-host-ruby-provisioner.git
|
21
|
+
fetch = +refs/heads/*:refs/remotes/origin/*
|
22
|
+
[branch "develop"]
|
23
|
+
remote = origin
|
24
|
+
merge = refs/heads/develop
|
25
|
+
[branch "master"]
|
26
|
+
remote = origin
|
27
|
+
merge = refs/heads/master
|
data/.git/description
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
Unnamed repository; edit this file 'description' to name the repository.
|
@@ -0,0 +1,15 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to check the commit log message taken by
|
4
|
+
# applypatch from an e-mail message.
|
5
|
+
#
|
6
|
+
# The hook should exit with non-zero status after issuing an
|
7
|
+
# appropriate message if it wants to stop the commit. The hook is
|
8
|
+
# allowed to edit the commit message file.
|
9
|
+
#
|
10
|
+
# To enable this hook, rename this file to "applypatch-msg".
|
11
|
+
|
12
|
+
. git-sh-setup
|
13
|
+
test -x "$GIT_DIR/hooks/commit-msg" &&
|
14
|
+
exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
|
15
|
+
:
|
@@ -0,0 +1,24 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to check the commit log message.
|
4
|
+
# Called by "git commit" with one argument, the name of the file
|
5
|
+
# that has the commit message. The hook should exit with non-zero
|
6
|
+
# status after issuing an appropriate message if it wants to stop the
|
7
|
+
# commit. The hook is allowed to edit the commit message file.
|
8
|
+
#
|
9
|
+
# To enable this hook, rename this file to "commit-msg".
|
10
|
+
|
11
|
+
# Uncomment the below to add a Signed-off-by line to the message.
|
12
|
+
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
13
|
+
# hook is more suited to it.
|
14
|
+
#
|
15
|
+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
16
|
+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
17
|
+
|
18
|
+
# This example catches duplicate Signed-off-by lines.
|
19
|
+
|
20
|
+
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
21
|
+
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
22
|
+
echo >&2 Duplicate Signed-off-by lines.
|
23
|
+
exit 1
|
24
|
+
}
|
@@ -0,0 +1,14 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to verify what is about to be committed
|
4
|
+
# by applypatch from an e-mail message.
|
5
|
+
#
|
6
|
+
# The hook should exit with non-zero status after issuing an
|
7
|
+
# appropriate message if it wants to stop the commit.
|
8
|
+
#
|
9
|
+
# To enable this hook, rename this file to "pre-applypatch".
|
10
|
+
|
11
|
+
. git-sh-setup
|
12
|
+
test -x "$GIT_DIR/hooks/pre-commit" &&
|
13
|
+
exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
|
14
|
+
:
|
@@ -0,0 +1,50 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to verify what is about to be committed.
|
4
|
+
# Called by "git commit" with no arguments. The hook should
|
5
|
+
# exit with non-zero status after issuing an appropriate message if
|
6
|
+
# it wants to stop the commit.
|
7
|
+
#
|
8
|
+
# To enable this hook, rename this file to "pre-commit".
|
9
|
+
|
10
|
+
if git rev-parse --verify HEAD >/dev/null 2>&1
|
11
|
+
then
|
12
|
+
against=HEAD
|
13
|
+
else
|
14
|
+
# Initial commit: diff against an empty tree object
|
15
|
+
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
16
|
+
fi
|
17
|
+
|
18
|
+
# If you want to allow non-ascii filenames set this variable to true.
|
19
|
+
allownonascii=$(git config hooks.allownonascii)
|
20
|
+
|
21
|
+
# Redirect output to stderr.
|
22
|
+
exec 1>&2
|
23
|
+
|
24
|
+
# Cross platform projects tend to avoid non-ascii filenames; prevent
|
25
|
+
# them from being added to the repository. We exploit the fact that the
|
26
|
+
# printable range starts at the space character and ends with tilde.
|
27
|
+
if [ "$allownonascii" != "true" ] &&
|
28
|
+
# Note that the use of brackets around a tr range is ok here, (it's
|
29
|
+
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
30
|
+
# the square bracket bytes happen to fall in the designated range.
|
31
|
+
test $(git diff --cached --name-only --diff-filter=A -z $against |
|
32
|
+
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
|
33
|
+
then
|
34
|
+
echo "Error: Attempt to add a non-ascii file name."
|
35
|
+
echo
|
36
|
+
echo "This can cause problems if you want to work"
|
37
|
+
echo "with people on other platforms."
|
38
|
+
echo
|
39
|
+
echo "To be portable it is advisable to rename the file ..."
|
40
|
+
echo
|
41
|
+
echo "If you know what you are doing you can disable this"
|
42
|
+
echo "check using:"
|
43
|
+
echo
|
44
|
+
echo " git config hooks.allownonascii true"
|
45
|
+
echo
|
46
|
+
exit 1
|
47
|
+
fi
|
48
|
+
|
49
|
+
# If there are whitespace errors, print the offending file names and fail.
|
50
|
+
exec git diff-index --check --cached $against --
|
@@ -0,0 +1,53 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
|
3
|
+
# An example hook script to verify what is about to be pushed. Called by "git
|
4
|
+
# push" after it has checked the remote status, but before anything has been
|
5
|
+
# pushed. If this script exits with a non-zero status nothing will be pushed.
|
6
|
+
#
|
7
|
+
# This hook is called with the following parameters:
|
8
|
+
#
|
9
|
+
# $1 -- Name of the remote to which the push is being done
|
10
|
+
# $2 -- URL to which the push is being done
|
11
|
+
#
|
12
|
+
# If pushing without using a named remote those arguments will be equal.
|
13
|
+
#
|
14
|
+
# Information about the commits which are being pushed is supplied as lines to
|
15
|
+
# the standard input in the form:
|
16
|
+
#
|
17
|
+
# <local ref> <local sha1> <remote ref> <remote sha1>
|
18
|
+
#
|
19
|
+
# This sample shows how to prevent push of commits where the log message starts
|
20
|
+
# with "WIP" (work in progress).
|
21
|
+
|
22
|
+
remote="$1"
|
23
|
+
url="$2"
|
24
|
+
|
25
|
+
z40=0000000000000000000000000000000000000000
|
26
|
+
|
27
|
+
IFS=' '
|
28
|
+
while read local_ref local_sha remote_ref remote_sha
|
29
|
+
do
|
30
|
+
if [ "$local_sha" = $z40 ]
|
31
|
+
then
|
32
|
+
# Handle delete
|
33
|
+
else
|
34
|
+
if [ "$remote_sha" = $z40 ]
|
35
|
+
then
|
36
|
+
# New branch, examine all commits
|
37
|
+
range="$local_sha"
|
38
|
+
else
|
39
|
+
# Update to existing branch, examine new commits
|
40
|
+
range="$remote_sha..$local_sha"
|
41
|
+
fi
|
42
|
+
|
43
|
+
# Check for WIP commit
|
44
|
+
commit=`git rev-list -n 1 --grep '^WIP' "$range"`
|
45
|
+
if [ -n "$commit" ]
|
46
|
+
then
|
47
|
+
echo "Found WIP commit in $local_ref, not pushing"
|
48
|
+
exit 1
|
49
|
+
fi
|
50
|
+
fi
|
51
|
+
done
|
52
|
+
|
53
|
+
exit 0
|
@@ -0,0 +1,169 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# Copyright (c) 2006, 2008 Junio C Hamano
|
4
|
+
#
|
5
|
+
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
6
|
+
# its job, and can prevent the command from running by exiting with
|
7
|
+
# non-zero status.
|
8
|
+
#
|
9
|
+
# The hook is called with the following parameters:
|
10
|
+
#
|
11
|
+
# $1 -- the upstream the series was forked from.
|
12
|
+
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
13
|
+
#
|
14
|
+
# This sample shows how to prevent topic branches that are already
|
15
|
+
# merged to 'next' branch from getting rebased, because allowing it
|
16
|
+
# would result in rebasing already published history.
|
17
|
+
|
18
|
+
publish=next
|
19
|
+
basebranch="$1"
|
20
|
+
if test "$#" = 2
|
21
|
+
then
|
22
|
+
topic="refs/heads/$2"
|
23
|
+
else
|
24
|
+
topic=`git symbolic-ref HEAD` ||
|
25
|
+
exit 0 ;# we do not interrupt rebasing detached HEAD
|
26
|
+
fi
|
27
|
+
|
28
|
+
case "$topic" in
|
29
|
+
refs/heads/??/*)
|
30
|
+
;;
|
31
|
+
*)
|
32
|
+
exit 0 ;# we do not interrupt others.
|
33
|
+
;;
|
34
|
+
esac
|
35
|
+
|
36
|
+
# Now we are dealing with a topic branch being rebased
|
37
|
+
# on top of master. Is it OK to rebase it?
|
38
|
+
|
39
|
+
# Does the topic really exist?
|
40
|
+
git show-ref -q "$topic" || {
|
41
|
+
echo >&2 "No such branch $topic"
|
42
|
+
exit 1
|
43
|
+
}
|
44
|
+
|
45
|
+
# Is topic fully merged to master?
|
46
|
+
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
47
|
+
if test -z "$not_in_master"
|
48
|
+
then
|
49
|
+
echo >&2 "$topic is fully merged to master; better remove it."
|
50
|
+
exit 1 ;# we could allow it, but there is no point.
|
51
|
+
fi
|
52
|
+
|
53
|
+
# Is topic ever merged to next? If so you should not be rebasing it.
|
54
|
+
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
55
|
+
only_next_2=`git rev-list ^master ${publish} | sort`
|
56
|
+
if test "$only_next_1" = "$only_next_2"
|
57
|
+
then
|
58
|
+
not_in_topic=`git rev-list "^$topic" master`
|
59
|
+
if test -z "$not_in_topic"
|
60
|
+
then
|
61
|
+
echo >&2 "$topic is already up-to-date with master"
|
62
|
+
exit 1 ;# we could allow it, but there is no point.
|
63
|
+
else
|
64
|
+
exit 0
|
65
|
+
fi
|
66
|
+
else
|
67
|
+
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
68
|
+
/usr/bin/perl -e '
|
69
|
+
my $topic = $ARGV[0];
|
70
|
+
my $msg = "* $topic has commits already merged to public branch:\n";
|
71
|
+
my (%not_in_next) = map {
|
72
|
+
/^([0-9a-f]+) /;
|
73
|
+
($1 => 1);
|
74
|
+
} split(/\n/, $ARGV[1]);
|
75
|
+
for my $elem (map {
|
76
|
+
/^([0-9a-f]+) (.*)$/;
|
77
|
+
[$1 => $2];
|
78
|
+
} split(/\n/, $ARGV[2])) {
|
79
|
+
if (!exists $not_in_next{$elem->[0]}) {
|
80
|
+
if ($msg) {
|
81
|
+
print STDERR $msg;
|
82
|
+
undef $msg;
|
83
|
+
}
|
84
|
+
print STDERR " $elem->[1]\n";
|
85
|
+
}
|
86
|
+
}
|
87
|
+
' "$topic" "$not_in_next" "$not_in_master"
|
88
|
+
exit 1
|
89
|
+
fi
|
90
|
+
|
91
|
+
exit 0
|
92
|
+
|
93
|
+
################################################################
|
94
|
+
|
95
|
+
This sample hook safeguards topic branches that have been
|
96
|
+
published from being rewound.
|
97
|
+
|
98
|
+
The workflow assumed here is:
|
99
|
+
|
100
|
+
* Once a topic branch forks from "master", "master" is never
|
101
|
+
merged into it again (either directly or indirectly).
|
102
|
+
|
103
|
+
* Once a topic branch is fully cooked and merged into "master",
|
104
|
+
it is deleted. If you need to build on top of it to correct
|
105
|
+
earlier mistakes, a new topic branch is created by forking at
|
106
|
+
the tip of the "master". This is not strictly necessary, but
|
107
|
+
it makes it easier to keep your history simple.
|
108
|
+
|
109
|
+
* Whenever you need to test or publish your changes to topic
|
110
|
+
branches, merge them into "next" branch.
|
111
|
+
|
112
|
+
The script, being an example, hardcodes the publish branch name
|
113
|
+
to be "next", but it is trivial to make it configurable via
|
114
|
+
$GIT_DIR/config mechanism.
|
115
|
+
|
116
|
+
With this workflow, you would want to know:
|
117
|
+
|
118
|
+
(1) ... if a topic branch has ever been merged to "next". Young
|
119
|
+
topic branches can have stupid mistakes you would rather
|
120
|
+
clean up before publishing, and things that have not been
|
121
|
+
merged into other branches can be easily rebased without
|
122
|
+
affecting other people. But once it is published, you would
|
123
|
+
not want to rewind it.
|
124
|
+
|
125
|
+
(2) ... if a topic branch has been fully merged to "master".
|
126
|
+
Then you can delete it. More importantly, you should not
|
127
|
+
build on top of it -- other people may already want to
|
128
|
+
change things related to the topic as patches against your
|
129
|
+
"master", so if you need further changes, it is better to
|
130
|
+
fork the topic (perhaps with the same name) afresh from the
|
131
|
+
tip of "master".
|
132
|
+
|
133
|
+
Let's look at this example:
|
134
|
+
|
135
|
+
o---o---o---o---o---o---o---o---o---o "next"
|
136
|
+
/ / / /
|
137
|
+
/ a---a---b A / /
|
138
|
+
/ / / /
|
139
|
+
/ / c---c---c---c B /
|
140
|
+
/ / / \ /
|
141
|
+
/ / / b---b C \ /
|
142
|
+
/ / / / \ /
|
143
|
+
---o---o---o---o---o---o---o---o---o---o---o "master"
|
144
|
+
|
145
|
+
|
146
|
+
A, B and C are topic branches.
|
147
|
+
|
148
|
+
* A has one fix since it was merged up to "next".
|
149
|
+
|
150
|
+
* B has finished. It has been fully merged up to "master" and "next",
|
151
|
+
and is ready to be deleted.
|
152
|
+
|
153
|
+
* C has not merged to "next" at all.
|
154
|
+
|
155
|
+
We would want to allow C to be rebased, refuse A, and encourage
|
156
|
+
B to be deleted.
|
157
|
+
|
158
|
+
To compute (1):
|
159
|
+
|
160
|
+
git rev-list ^master ^topic next
|
161
|
+
git rev-list ^master next
|
162
|
+
|
163
|
+
if these match, topic has not merged in next at all.
|
164
|
+
|
165
|
+
To compute (2):
|
166
|
+
|
167
|
+
git rev-list master..topic
|
168
|
+
|
169
|
+
if this is empty, it is fully merged to "master".
|
@@ -0,0 +1,36 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to prepare the commit log message.
|
4
|
+
# Called by "git commit" with the name of the file that has the
|
5
|
+
# commit message, followed by the description of the commit
|
6
|
+
# message's source. The hook's purpose is to edit the commit
|
7
|
+
# message file. If the hook fails with a non-zero status,
|
8
|
+
# the commit is aborted.
|
9
|
+
#
|
10
|
+
# To enable this hook, rename this file to "prepare-commit-msg".
|
11
|
+
|
12
|
+
# This hook includes three examples. The first comments out the
|
13
|
+
# "Conflicts:" part of a merge commit.
|
14
|
+
#
|
15
|
+
# The second includes the output of "git diff --name-status -r"
|
16
|
+
# into the message, just before the "git status" output. It is
|
17
|
+
# commented because it doesn't cope with --amend or with squashed
|
18
|
+
# commits.
|
19
|
+
#
|
20
|
+
# The third example adds a Signed-off-by line to the message, that can
|
21
|
+
# still be edited. This is rarely a good idea.
|
22
|
+
|
23
|
+
case "$2,$3" in
|
24
|
+
merge,)
|
25
|
+
/usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
|
26
|
+
|
27
|
+
# ,|template,)
|
28
|
+
# /usr/bin/perl -i.bak -pe '
|
29
|
+
# print "\n" . `git diff --cached --name-status -r`
|
30
|
+
# if /^#/ && $first++ == 0' "$1" ;;
|
31
|
+
|
32
|
+
*) ;;
|
33
|
+
esac
|
34
|
+
|
35
|
+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
36
|
+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
@@ -0,0 +1,128 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to blocks unannotated tags from entering.
|
4
|
+
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
|
5
|
+
#
|
6
|
+
# To enable this hook, rename this file to "update".
|
7
|
+
#
|
8
|
+
# Config
|
9
|
+
# ------
|
10
|
+
# hooks.allowunannotated
|
11
|
+
# This boolean sets whether unannotated tags will be allowed into the
|
12
|
+
# repository. By default they won't be.
|
13
|
+
# hooks.allowdeletetag
|
14
|
+
# This boolean sets whether deleting tags will be allowed in the
|
15
|
+
# repository. By default they won't be.
|
16
|
+
# hooks.allowmodifytag
|
17
|
+
# This boolean sets whether a tag may be modified after creation. By default
|
18
|
+
# it won't be.
|
19
|
+
# hooks.allowdeletebranch
|
20
|
+
# This boolean sets whether deleting branches will be allowed in the
|
21
|
+
# repository. By default they won't be.
|
22
|
+
# hooks.denycreatebranch
|
23
|
+
# This boolean sets whether remotely creating branches will be denied
|
24
|
+
# in the repository. By default this is allowed.
|
25
|
+
#
|
26
|
+
|
27
|
+
# --- Command line
|
28
|
+
refname="$1"
|
29
|
+
oldrev="$2"
|
30
|
+
newrev="$3"
|
31
|
+
|
32
|
+
# --- Safety check
|
33
|
+
if [ -z "$GIT_DIR" ]; then
|
34
|
+
echo "Don't run this script from the command line." >&2
|
35
|
+
echo " (if you want, you could supply GIT_DIR then run" >&2
|
36
|
+
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
37
|
+
exit 1
|
38
|
+
fi
|
39
|
+
|
40
|
+
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
41
|
+
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
|
42
|
+
exit 1
|
43
|
+
fi
|
44
|
+
|
45
|
+
# --- Config
|
46
|
+
allowunannotated=$(git config --bool hooks.allowunannotated)
|
47
|
+
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
|
48
|
+
denycreatebranch=$(git config --bool hooks.denycreatebranch)
|
49
|
+
allowdeletetag=$(git config --bool hooks.allowdeletetag)
|
50
|
+
allowmodifytag=$(git config --bool hooks.allowmodifytag)
|
51
|
+
|
52
|
+
# check for no description
|
53
|
+
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
54
|
+
case "$projectdesc" in
|
55
|
+
"Unnamed repository"* | "")
|
56
|
+
echo "*** Project description file hasn't been set" >&2
|
57
|
+
exit 1
|
58
|
+
;;
|
59
|
+
esac
|
60
|
+
|
61
|
+
# --- Check types
|
62
|
+
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
63
|
+
zero="0000000000000000000000000000000000000000"
|
64
|
+
if [ "$newrev" = "$zero" ]; then
|
65
|
+
newrev_type=delete
|
66
|
+
else
|
67
|
+
newrev_type=$(git cat-file -t $newrev)
|
68
|
+
fi
|
69
|
+
|
70
|
+
case "$refname","$newrev_type" in
|
71
|
+
refs/tags/*,commit)
|
72
|
+
# un-annotated tag
|
73
|
+
short_refname=${refname##refs/tags/}
|
74
|
+
if [ "$allowunannotated" != "true" ]; then
|
75
|
+
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
76
|
+
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
77
|
+
exit 1
|
78
|
+
fi
|
79
|
+
;;
|
80
|
+
refs/tags/*,delete)
|
81
|
+
# delete tag
|
82
|
+
if [ "$allowdeletetag" != "true" ]; then
|
83
|
+
echo "*** Deleting a tag is not allowed in this repository" >&2
|
84
|
+
exit 1
|
85
|
+
fi
|
86
|
+
;;
|
87
|
+
refs/tags/*,tag)
|
88
|
+
# annotated tag
|
89
|
+
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
|
90
|
+
then
|
91
|
+
echo "*** Tag '$refname' already exists." >&2
|
92
|
+
echo "*** Modifying a tag is not allowed in this repository." >&2
|
93
|
+
exit 1
|
94
|
+
fi
|
95
|
+
;;
|
96
|
+
refs/heads/*,commit)
|
97
|
+
# branch
|
98
|
+
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
99
|
+
echo "*** Creating a branch is not allowed in this repository" >&2
|
100
|
+
exit 1
|
101
|
+
fi
|
102
|
+
;;
|
103
|
+
refs/heads/*,delete)
|
104
|
+
# delete branch
|
105
|
+
if [ "$allowdeletebranch" != "true" ]; then
|
106
|
+
echo "*** Deleting a branch is not allowed in this repository" >&2
|
107
|
+
exit 1
|
108
|
+
fi
|
109
|
+
;;
|
110
|
+
refs/remotes/*,commit)
|
111
|
+
# tracking branch
|
112
|
+
;;
|
113
|
+
refs/remotes/*,delete)
|
114
|
+
# delete tracking branch
|
115
|
+
if [ "$allowdeletebranch" != "true" ]; then
|
116
|
+
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
117
|
+
exit 1
|
118
|
+
fi
|
119
|
+
;;
|
120
|
+
*)
|
121
|
+
# Anything else (is there anything else?)
|
122
|
+
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
123
|
+
exit 1
|
124
|
+
;;
|
125
|
+
esac
|
126
|
+
|
127
|
+
# --- Finished
|
128
|
+
exit 0
|
data/.git/index
ADDED
Binary file
|
data/.git/info/exclude
ADDED
data/.git/logs/HEAD
ADDED
@@ -0,0 +1,18 @@
|
|
1
|
+
0000000000000000000000000000000000000000 cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 Jonathan Barronville <jonathan@belairlabs.com> 1389508799 -0500 commit (initial): Initial commit
|
2
|
+
cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 Jonathan Barronville <jonathan@belairlabs.com> 1389508800 -0500 checkout: moving from master to develop
|
3
|
+
cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 ad48deb220c14f264ea31ae345163f53434a4a89 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508829 -0500 commit: First legit commit with all the code.
|
4
|
+
ad48deb220c14f264ea31ae345163f53434a4a89 ad48deb220c14f264ea31ae345163f53434a4a89 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508838 -0500 checkout: moving from develop to release/0.0.1
|
5
|
+
ad48deb220c14f264ea31ae345163f53434a4a89 cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508846 -0500 checkout: moving from release/0.0.1 to master
|
6
|
+
cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 dfa83063026d1177200981794e135a1e8843e56a Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508846 -0500 merge release/0.0.1: Merge made by the 'recursive' strategy.
|
7
|
+
dfa83063026d1177200981794e135a1e8843e56a ad48deb220c14f264ea31ae345163f53434a4a89 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508859 -0500 checkout: moving from master to develop
|
8
|
+
ad48deb220c14f264ea31ae345163f53434a4a89 dfa83063026d1177200981794e135a1e8843e56a Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510156 -0500 checkout: moving from develop to hotfix/0.0.1-hotfix-small-update-001
|
9
|
+
dfa83063026d1177200981794e135a1e8843e56a a03c75b8391d082613b8e060afc753d8e344e033 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510211 -0500 commit: Small updates.
|
10
|
+
a03c75b8391d082613b8e060afc753d8e344e033 dfa83063026d1177200981794e135a1e8843e56a Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510236 -0500 checkout: moving from hotfix/0.0.1-hotfix-small-update-001 to master
|
11
|
+
dfa83063026d1177200981794e135a1e8843e56a 742a7893188658eaea4c183b85395472b3c90a50 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510236 -0500 merge hotfix/0.0.1-hotfix-small-update-001: Merge made by the 'recursive' strategy.
|
12
|
+
742a7893188658eaea4c183b85395472b3c90a50 ad48deb220c14f264ea31ae345163f53434a4a89 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510245 -0500 checkout: moving from master to develop
|
13
|
+
ad48deb220c14f264ea31ae345163f53434a4a89 3053454fe8ce25790fb0bb99e085aed05f0920c9 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510245 -0500 merge hotfix/0.0.1-hotfix-small-update-001: Merge made by the 'recursive' strategy.
|
14
|
+
3053454fe8ce25790fb0bb99e085aed05f0920c9 805263aed3f51ee4f45aa2dfe70f8375c76900c9 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510694 -0500 commit: You piss me off RubyGems.
|
15
|
+
805263aed3f51ee4f45aa2dfe70f8375c76900c9 805263aed3f51ee4f45aa2dfe70f8375c76900c9 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510715 -0500 checkout: moving from develop to release/0.0.2
|
16
|
+
805263aed3f51ee4f45aa2dfe70f8375c76900c9 742a7893188658eaea4c183b85395472b3c90a50 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510717 -0500 checkout: moving from release/0.0.2 to master
|
17
|
+
742a7893188658eaea4c183b85395472b3c90a50 a6b93ec58569d60b55136a7ff3f5f576916e303c Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510717 -0500 merge release/0.0.2: Merge made by the 'recursive' strategy.
|
18
|
+
a6b93ec58569d60b55136a7ff3f5f576916e303c 805263aed3f51ee4f45aa2dfe70f8375c76900c9 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510734 -0500 checkout: moving from master to develop
|
@@ -0,0 +1,4 @@
|
|
1
|
+
0000000000000000000000000000000000000000 cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 Jonathan Barronville <jonathan@belairlabs.com> 1389508799 -0500 branch: Created from master
|
2
|
+
cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 ad48deb220c14f264ea31ae345163f53434a4a89 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508829 -0500 commit: First legit commit with all the code.
|
3
|
+
ad48deb220c14f264ea31ae345163f53434a4a89 3053454fe8ce25790fb0bb99e085aed05f0920c9 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510245 -0500 merge hotfix/0.0.1-hotfix-small-update-001: Merge made by the 'recursive' strategy.
|
4
|
+
3053454fe8ce25790fb0bb99e085aed05f0920c9 805263aed3f51ee4f45aa2dfe70f8375c76900c9 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510694 -0500 commit: You piss me off RubyGems.
|
@@ -0,0 +1,4 @@
|
|
1
|
+
0000000000000000000000000000000000000000 cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 Jonathan Barronville <jonathan@belairlabs.com> 1389508799 -0500 commit (initial): Initial commit
|
2
|
+
cb4945b0775afb714f0f6f1fe5fc53ad5daf8985 dfa83063026d1177200981794e135a1e8843e56a Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508846 -0500 merge release/0.0.1: Merge made by the 'recursive' strategy.
|
3
|
+
dfa83063026d1177200981794e135a1e8843e56a 742a7893188658eaea4c183b85395472b3c90a50 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510236 -0500 merge hotfix/0.0.1-hotfix-small-update-001: Merge made by the 'recursive' strategy.
|
4
|
+
742a7893188658eaea4c183b85395472b3c90a50 a6b93ec58569d60b55136a7ff3f5f576916e303c Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510717 -0500 merge release/0.0.2: Merge made by the 'recursive' strategy.
|
@@ -0,0 +1,3 @@
|
|
1
|
+
0000000000000000000000000000000000000000 ad48deb220c14f264ea31ae345163f53434a4a89 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508910 -0500 update by push
|
2
|
+
ad48deb220c14f264ea31ae345163f53434a4a89 3053454fe8ce25790fb0bb99e085aed05f0920c9 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510255 -0500 update by push
|
3
|
+
3053454fe8ce25790fb0bb99e085aed05f0920c9 805263aed3f51ee4f45aa2dfe70f8375c76900c9 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510745 -0500 update by push
|
@@ -0,0 +1,3 @@
|
|
1
|
+
0000000000000000000000000000000000000000 dfa83063026d1177200981794e135a1e8843e56a Jonathan Barronville <jonathan.barronville@jebbit.com> 1389508910 -0500 update by push
|
2
|
+
dfa83063026d1177200981794e135a1e8843e56a 742a7893188658eaea4c183b85395472b3c90a50 Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510255 -0500 update by push
|
3
|
+
742a7893188658eaea4c183b85395472b3c90a50 a6b93ec58569d60b55136a7ff3f5f576916e303c Jonathan Barronville <jonathan.barronville@jebbit.com> 1389510745 -0500 update by push
|
@@ -0,0 +1 @@
|
|
1
|
+
x}�;o1���SA�� �� �)(-��{�%����>���jF߬�4\�s�4��!�D�
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|