dandelion 0.4.10 → 0.4.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +11 -3
- data/dandelion.gemspec +1 -1
- data/lib/dandelion/cli.rb +21 -13
- data/lib/dandelion/tree.rb +17 -4
- data/lib/dandelion/version.rb +1 -1
- data/spec/dandelion/tree_spec.rb +10 -1
- data/spec/fixtures/repo_submodule.git/HEAD +1 -0
- data/spec/fixtures/repo_submodule.git/config +6 -0
- data/spec/fixtures/repo_submodule.git/description +1 -0
- data/spec/fixtures/repo_submodule.git/hooks/applypatch-msg.sample +15 -0
- data/spec/fixtures/repo_submodule.git/hooks/commit-msg.sample +24 -0
- data/spec/fixtures/repo_submodule.git/hooks/post-update.sample +8 -0
- data/spec/fixtures/repo_submodule.git/hooks/pre-applypatch.sample +14 -0
- data/spec/fixtures/repo_submodule.git/hooks/pre-commit.sample +49 -0
- data/spec/fixtures/repo_submodule.git/hooks/pre-push.sample +54 -0
- data/spec/fixtures/repo_submodule.git/hooks/pre-rebase.sample +169 -0
- data/spec/fixtures/repo_submodule.git/hooks/prepare-commit-msg.sample +36 -0
- data/spec/fixtures/repo_submodule.git/hooks/update.sample +128 -0
- data/spec/fixtures/repo_submodule.git/info/exclude +6 -0
- data/spec/fixtures/repo_submodule.git/objects/52/4dab9c7295065a26dca3db4a7022358d30deed +0 -0
- data/spec/fixtures/repo_submodule.git/objects/d7/8bb598353d064c0572c53e0c03ec6dc7550505 +0 -0
- data/spec/fixtures/repo_submodule.git/objects/ed/393d7ff451fb04e9ea7c435e09303783106015 +0 -0
- data/spec/fixtures/repo_submodule.git/refs/heads/master +1 -0
- metadata +41 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f06b7907e4f2364571234103eee86baf93586f27
|
4
|
+
data.tar.gz: e2bad112c8c5268996f0a7302432573df62217e6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3169d21ff09df186d7782f1f4284cc568605384e7b9efac6be8bc06a545e46af7b238d833767203d179a7e3b945591317c4fc7896d25d8aa7c52c0265c384675
|
7
|
+
data.tar.gz: ea02c7412a341e9fc5954daa8b14c5a8dc77664c1fc8b508a7d28f6072b22a299c20817c00824c6cdc456cc3a833cb9fa1218c56442727dd3e71d4092b31a46c
|
data/README.md
CHANGED
@@ -14,6 +14,14 @@ Ensure that Ruby >= 1.9.2 is installed, then run:
|
|
14
14
|
|
15
15
|
$ gem install dandelion
|
16
16
|
|
17
|
+
You may need to install `pkg-config` and `cmake` before installing Dandelion. They're likely available in your OS package manager. For example:
|
18
|
+
|
19
|
+
$ brew install pkg-config cmake
|
20
|
+
|
21
|
+
or
|
22
|
+
|
23
|
+
$ apt-get install pkg-config cmake
|
24
|
+
|
17
25
|
Config
|
18
26
|
------
|
19
27
|
|
@@ -116,10 +124,10 @@ Required:
|
|
116
124
|
* `access_key_id`
|
117
125
|
* `secret_access_key`
|
118
126
|
* `bucket_name`
|
127
|
+
* `host` (one of the endpoints listed [here](http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region), defaults to s3.amazonaws.com)
|
119
128
|
|
120
129
|
Optional:
|
121
130
|
|
122
|
-
* `host` (defaults to s3.amazonaws.com)
|
123
131
|
* `preserve_permissions` (defaults to true)
|
124
132
|
|
125
133
|
Usage
|
@@ -151,10 +159,10 @@ For a more complete summary of usage options, run:
|
|
151
159
|
deploy
|
152
160
|
init
|
153
161
|
status
|
154
|
-
|
162
|
+
|
155
163
|
Note that when specifying the repository or configuration file, the given paths
|
156
164
|
are relative to the current working directory (not the repository root).
|
157
|
-
|
165
|
+
|
158
166
|
To see the options for a particular command, run `dandelion <command> -h`:
|
159
167
|
|
160
168
|
$ dandelion deploy -h
|
data/dandelion.gemspec
CHANGED
data/lib/dandelion/cli.rb
CHANGED
@@ -49,7 +49,7 @@ module Dandelion
|
|
49
49
|
if @args.length == 0
|
50
50
|
@options[:help] = true
|
51
51
|
end
|
52
|
-
|
52
|
+
|
53
53
|
parse!(@parser)
|
54
54
|
|
55
55
|
if @options[:version]
|
@@ -77,22 +77,38 @@ module Dandelion
|
|
77
77
|
end
|
78
78
|
end
|
79
79
|
|
80
|
-
|
80
|
+
private
|
81
81
|
|
82
82
|
def config_path
|
83
|
-
@options[:config]
|
83
|
+
if @options[:config]
|
84
|
+
@options[:config]
|
85
|
+
else
|
86
|
+
paths = [
|
87
|
+
File.join(repo_path, 'dandelion.yml'),
|
88
|
+
File.join(repo_path, 'dandelion.yaml')
|
89
|
+
]
|
90
|
+
|
91
|
+
paths.drop_while { |path| !path || !File.exists?(path) }.first
|
92
|
+
end
|
84
93
|
end
|
85
94
|
|
86
95
|
def repo_path
|
87
96
|
if @options[:repo]
|
88
97
|
File.expand_path(@options[:repo])
|
89
98
|
else
|
90
|
-
|
99
|
+
File.expand_path('.')
|
91
100
|
end
|
92
101
|
end
|
93
102
|
|
103
|
+
def repo_exists?
|
104
|
+
return !!(repo)
|
105
|
+
rescue ::IOError, ::Rugged::OSError
|
106
|
+
# squash exceptions for instantiating Rugged repo
|
107
|
+
return false
|
108
|
+
end
|
109
|
+
|
94
110
|
def validate!
|
95
|
-
unless
|
111
|
+
unless repo_exists?
|
96
112
|
log.fatal("Not a git repository: #{repo_path}")
|
97
113
|
exit 1
|
98
114
|
end
|
@@ -113,14 +129,6 @@ module Dandelion
|
|
113
129
|
end
|
114
130
|
end
|
115
131
|
|
116
|
-
def closest_repo(dir)
|
117
|
-
if File.exists?(File.join(dir, '.git'))
|
118
|
-
dir
|
119
|
-
else
|
120
|
-
File.dirname(dir) != dir && closest_repo(File.dirname(dir)) || File.expand_path('.')
|
121
|
-
end
|
122
|
-
end
|
123
|
-
|
124
132
|
def display_help
|
125
133
|
log.info(@parser.help)
|
126
134
|
log.info("Available commands:")
|
data/lib/dandelion/tree.rb
CHANGED
@@ -8,6 +8,20 @@ module Dandelion
|
|
8
8
|
end
|
9
9
|
|
10
10
|
def data(path)
|
11
|
+
submodule = @repo.submodules[path]
|
12
|
+
|
13
|
+
if submodule
|
14
|
+
# TODO
|
15
|
+
nil
|
16
|
+
else
|
17
|
+
info, obj = object(path)
|
18
|
+
content(info, obj)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
private
|
23
|
+
|
24
|
+
def object(path)
|
11
25
|
object = @commit.tree
|
12
26
|
info = {}
|
13
27
|
|
@@ -17,14 +31,13 @@ module Dandelion
|
|
17
31
|
return nil unless info[:type]
|
18
32
|
|
19
33
|
object = @repo.lookup(info[:oid])
|
34
|
+
|
20
35
|
return nil unless object
|
21
36
|
end
|
22
37
|
|
23
|
-
|
38
|
+
[info, object]
|
24
39
|
end
|
25
40
|
|
26
|
-
private
|
27
|
-
|
28
41
|
def content(info, object)
|
29
42
|
# https://github.com/libgit2/libgit2/blob/development/include/git2/types.h
|
30
43
|
if info[:filemode] == 0120000
|
@@ -46,4 +59,4 @@ module Dandelion
|
|
46
59
|
result
|
47
60
|
end
|
48
61
|
end
|
49
|
-
end
|
62
|
+
end
|
data/lib/dandelion/version.rb
CHANGED
data/spec/dandelion/tree_spec.rb
CHANGED
@@ -20,5 +20,14 @@ describe Dandelion::Tree do
|
|
20
20
|
expect(tree.data('link')).to eq "bar\n"
|
21
21
|
end
|
22
22
|
end
|
23
|
+
|
24
|
+
context 'submodule' do
|
25
|
+
let(:repo) { test_repo('repo_submodule') }
|
26
|
+
let(:tree) { test_tree(repo: repo, commit: repo.lookup('ed393d7ff451fb04e9ea7c435e09303783106015')) }
|
27
|
+
|
28
|
+
it 'does not raise error' do
|
29
|
+
tree.data('repo')
|
30
|
+
end
|
31
|
+
end
|
23
32
|
end
|
24
|
-
end
|
33
|
+
end
|
@@ -0,0 +1 @@
|
|
1
|
+
ref: refs/heads/master
|
@@ -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,49 @@
|
|
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 --bool 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
|
+
cat <<\EOF
|
35
|
+
Error: Attempt to add a non-ASCII file name.
|
36
|
+
|
37
|
+
This can cause problems if you want to work with people on other platforms.
|
38
|
+
|
39
|
+
To be portable it is advisable to rename the file.
|
40
|
+
|
41
|
+
If you know what you are doing you can disable this check using:
|
42
|
+
|
43
|
+
git config hooks.allownonascii true
|
44
|
+
EOF
|
45
|
+
exit 1
|
46
|
+
fi
|
47
|
+
|
48
|
+
# If there are whitespace errors, print the offending file names and fail.
|
49
|
+
exec git diff-index --check --cached $against --
|
@@ -0,0 +1,54 @@
|
|
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
|
+
:
|
34
|
+
else
|
35
|
+
if [ "$remote_sha" = $z40 ]
|
36
|
+
then
|
37
|
+
# New branch, examine all commits
|
38
|
+
range="$local_sha"
|
39
|
+
else
|
40
|
+
# Update to existing branch, examine new commits
|
41
|
+
range="$remote_sha..$local_sha"
|
42
|
+
fi
|
43
|
+
|
44
|
+
# Check for WIP commit
|
45
|
+
commit=`git rev-list -n 1 --grep '^WIP' "$range"`
|
46
|
+
if [ -n "$commit" ]
|
47
|
+
then
|
48
|
+
echo >&2 "Found WIP commit in $local_ref, not pushing"
|
49
|
+
exit 1
|
50
|
+
fi
|
51
|
+
fi
|
52
|
+
done
|
53
|
+
|
54
|
+
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
|
Binary file
|
Binary file
|
Binary file
|
@@ -0,0 +1 @@
|
|
1
|
+
ed393d7ff451fb04e9ea7c435e09303783106015
|
metadata
CHANGED
@@ -1,29 +1,29 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dandelion
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.14
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Scott Nelson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-05-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rugged
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 0.22.1b1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- -
|
24
|
+
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.
|
26
|
+
version: 0.22.1b1
|
27
27
|
description:
|
28
28
|
email:
|
29
29
|
- scott@scttnlsn.com
|
@@ -105,6 +105,23 @@ files:
|
|
105
105
|
- spec/fixtures/repo.git/objects/f6/66b137794d56880bab05e8fd256713a8fccf92
|
106
106
|
- spec/fixtures/repo.git/refs/heads/master
|
107
107
|
- spec/fixtures/repo.git/refs/tags/test-tag
|
108
|
+
- spec/fixtures/repo_submodule.git/HEAD
|
109
|
+
- spec/fixtures/repo_submodule.git/config
|
110
|
+
- spec/fixtures/repo_submodule.git/description
|
111
|
+
- spec/fixtures/repo_submodule.git/hooks/applypatch-msg.sample
|
112
|
+
- spec/fixtures/repo_submodule.git/hooks/commit-msg.sample
|
113
|
+
- spec/fixtures/repo_submodule.git/hooks/post-update.sample
|
114
|
+
- spec/fixtures/repo_submodule.git/hooks/pre-applypatch.sample
|
115
|
+
- spec/fixtures/repo_submodule.git/hooks/pre-commit.sample
|
116
|
+
- spec/fixtures/repo_submodule.git/hooks/pre-push.sample
|
117
|
+
- spec/fixtures/repo_submodule.git/hooks/pre-rebase.sample
|
118
|
+
- spec/fixtures/repo_submodule.git/hooks/prepare-commit-msg.sample
|
119
|
+
- spec/fixtures/repo_submodule.git/hooks/update.sample
|
120
|
+
- spec/fixtures/repo_submodule.git/info/exclude
|
121
|
+
- spec/fixtures/repo_submodule.git/objects/52/4dab9c7295065a26dca3db4a7022358d30deed
|
122
|
+
- spec/fixtures/repo_submodule.git/objects/d7/8bb598353d064c0572c53e0c03ec6dc7550505
|
123
|
+
- spec/fixtures/repo_submodule.git/objects/ed/393d7ff451fb04e9ea7c435e09303783106015
|
124
|
+
- spec/fixtures/repo_submodule.git/refs/heads/master
|
108
125
|
- spec/fixtures/repo_symlink.git/HEAD
|
109
126
|
- spec/fixtures/repo_symlink.git/config
|
110
127
|
- spec/fixtures/repo_symlink.git/description
|
@@ -164,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
164
181
|
version: '0'
|
165
182
|
requirements: []
|
166
183
|
rubyforge_project:
|
167
|
-
rubygems_version: 2.
|
184
|
+
rubygems_version: 2.4.5
|
168
185
|
signing_key:
|
169
186
|
specification_version: 4
|
170
187
|
summary: Incremental Git repository deployment
|
@@ -212,6 +229,23 @@ test_files:
|
|
212
229
|
- spec/fixtures/repo.git/objects/f6/66b137794d56880bab05e8fd256713a8fccf92
|
213
230
|
- spec/fixtures/repo.git/refs/heads/master
|
214
231
|
- spec/fixtures/repo.git/refs/tags/test-tag
|
232
|
+
- spec/fixtures/repo_submodule.git/HEAD
|
233
|
+
- spec/fixtures/repo_submodule.git/config
|
234
|
+
- spec/fixtures/repo_submodule.git/description
|
235
|
+
- spec/fixtures/repo_submodule.git/hooks/applypatch-msg.sample
|
236
|
+
- spec/fixtures/repo_submodule.git/hooks/commit-msg.sample
|
237
|
+
- spec/fixtures/repo_submodule.git/hooks/post-update.sample
|
238
|
+
- spec/fixtures/repo_submodule.git/hooks/pre-applypatch.sample
|
239
|
+
- spec/fixtures/repo_submodule.git/hooks/pre-commit.sample
|
240
|
+
- spec/fixtures/repo_submodule.git/hooks/pre-push.sample
|
241
|
+
- spec/fixtures/repo_submodule.git/hooks/pre-rebase.sample
|
242
|
+
- spec/fixtures/repo_submodule.git/hooks/prepare-commit-msg.sample
|
243
|
+
- spec/fixtures/repo_submodule.git/hooks/update.sample
|
244
|
+
- spec/fixtures/repo_submodule.git/info/exclude
|
245
|
+
- spec/fixtures/repo_submodule.git/objects/52/4dab9c7295065a26dca3db4a7022358d30deed
|
246
|
+
- spec/fixtures/repo_submodule.git/objects/d7/8bb598353d064c0572c53e0c03ec6dc7550505
|
247
|
+
- spec/fixtures/repo_submodule.git/objects/ed/393d7ff451fb04e9ea7c435e09303783106015
|
248
|
+
- spec/fixtures/repo_submodule.git/refs/heads/master
|
215
249
|
- spec/fixtures/repo_symlink.git/HEAD
|
216
250
|
- spec/fixtures/repo_symlink.git/config
|
217
251
|
- spec/fixtures/repo_symlink.git/description
|