danger-linear_history 0.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/.gitignore +5 -0
- data/.rubocop.yml +15 -0
- data/Gemfile +4 -0
- data/Gemfile.lock +132 -0
- data/Guardfile +19 -0
- data/LICENSE.txt +22 -0
- data/README.md +23 -0
- data/Rakefile +23 -0
- data/circle.yml +3 -0
- data/danger-linear_history.gemspec +50 -0
- data/lib/danger_plugin.rb +39 -0
- data/lib/version.rb +3 -0
- data/spec/fixtures/linear/COMMIT_EDITMSG +1 -0
- data/spec/fixtures/linear/HEAD +1 -0
- data/spec/fixtures/linear/MERGE_RR +0 -0
- data/spec/fixtures/linear/config +7 -0
- data/spec/fixtures/linear/description +1 -0
- data/spec/fixtures/linear/hooks/applypatch-msg.sample +15 -0
- data/spec/fixtures/linear/hooks/commit-msg.sample +24 -0
- data/spec/fixtures/linear/hooks/post-update.sample +8 -0
- data/spec/fixtures/linear/hooks/pre-applypatch.sample +14 -0
- data/spec/fixtures/linear/hooks/pre-commit.sample +49 -0
- data/spec/fixtures/linear/hooks/pre-push.sample +53 -0
- data/spec/fixtures/linear/hooks/pre-rebase.sample +169 -0
- data/spec/fixtures/linear/hooks/pre-receive.sample +24 -0
- data/spec/fixtures/linear/hooks/prepare-commit-msg.sample +36 -0
- data/spec/fixtures/linear/hooks/update.sample +128 -0
- data/spec/fixtures/linear/index +0 -0
- data/spec/fixtures/linear/info/exclude +6 -0
- data/spec/fixtures/linear/info/refs +1 -0
- data/spec/fixtures/linear/logs/HEAD +3 -0
- data/spec/fixtures/linear/logs/refs/heads/master +3 -0
- data/spec/fixtures/linear/objects/info/packs +2 -0
- data/spec/fixtures/linear/objects/pack/pack-0d11e1d12c122d1872a828e6c2ab3c81ee31b0a3.idx +0 -0
- data/spec/fixtures/linear/objects/pack/pack-0d11e1d12c122d1872a828e6c2ab3c81ee31b0a3.pack +0 -0
- data/spec/fixtures/linear/packed-refs +2 -0
- data/spec/fixtures/nonlinear/COMMIT_EDITMSG +19 -0
- data/spec/fixtures/nonlinear/HEAD +1 -0
- data/spec/fixtures/nonlinear/MERGE_RR +0 -0
- data/spec/fixtures/nonlinear/ORIG_HEAD +1 -0
- data/spec/fixtures/nonlinear/config +7 -0
- data/spec/fixtures/nonlinear/description +1 -0
- data/spec/fixtures/nonlinear/hooks/applypatch-msg.sample +15 -0
- data/spec/fixtures/nonlinear/hooks/commit-msg.sample +24 -0
- data/spec/fixtures/nonlinear/hooks/post-update.sample +8 -0
- data/spec/fixtures/nonlinear/hooks/pre-applypatch.sample +14 -0
- data/spec/fixtures/nonlinear/hooks/pre-commit.sample +49 -0
- data/spec/fixtures/nonlinear/hooks/pre-push.sample +53 -0
- data/spec/fixtures/nonlinear/hooks/pre-rebase.sample +169 -0
- data/spec/fixtures/nonlinear/hooks/pre-receive.sample +24 -0
- data/spec/fixtures/nonlinear/hooks/prepare-commit-msg.sample +36 -0
- data/spec/fixtures/nonlinear/hooks/update.sample +128 -0
- data/spec/fixtures/nonlinear/index +0 -0
- data/spec/fixtures/nonlinear/info/exclude +6 -0
- data/spec/fixtures/nonlinear/info/refs +1 -0
- data/spec/fixtures/nonlinear/logs/HEAD +8 -0
- data/spec/fixtures/nonlinear/logs/refs/heads/master +5 -0
- data/spec/fixtures/nonlinear/objects/c4/502db7a73cfd334e9c1ab3988fbb7e3c2560bf +0 -0
- data/spec/fixtures/nonlinear/objects/info/packs +2 -0
- data/spec/fixtures/nonlinear/objects/pack/pack-c15a48c606d589bebf788e824ec15946ddc2171b.idx +0 -0
- data/spec/fixtures/nonlinear/objects/pack/pack-c15a48c606d589bebf788e824ec15946ddc2171b.pack +0 -0
- data/spec/fixtures/nonlinear/packed-refs +2 -0
- data/spec/fixtures/nonlinear/rr-cache/b5af61297bb440010b5deb18d272d0976716bc1f/postimage +3 -0
- data/spec/fixtures/nonlinear/rr-cache/b5af61297bb440010b5deb18d272d0976716bc1f/preimage +6 -0
- data/spec/linear_history_spec.rb +83 -0
- data/spec/spec_helper.rb +59 -0
- metadata +304 -0
Binary file
|
@@ -0,0 +1 @@
|
|
1
|
+
8d5e102914281fe4b19b869f589d38bac129c760 refs/heads/master
|
@@ -0,0 +1,3 @@
|
|
1
|
+
0000000000000000000000000000000000000000 b9d280495d21479c77b5bf81f77fb8302eaf7531 Alexsander Akers <me@a2.io> 1492436969 +0200 commit (initial): A
|
2
|
+
b9d280495d21479c77b5bf81f77fb8302eaf7531 f4688a6a7635159ae038a746babde4cef54ac225 Alexsander Akers <me@a2.io> 1492436990 +0200 commit: B
|
3
|
+
f4688a6a7635159ae038a746babde4cef54ac225 8d5e102914281fe4b19b869f589d38bac129c760 Alexsander Akers <me@a2.io> 1492436996 +0200 commit: C
|
@@ -0,0 +1,3 @@
|
|
1
|
+
0000000000000000000000000000000000000000 b9d280495d21479c77b5bf81f77fb8302eaf7531 Alexsander Akers <me@a2.io> 1492436969 +0200 commit (initial): A
|
2
|
+
b9d280495d21479c77b5bf81f77fb8302eaf7531 f4688a6a7635159ae038a746babde4cef54ac225 Alexsander Akers <me@a2.io> 1492436990 +0200 commit: B
|
3
|
+
f4688a6a7635159ae038a746babde4cef54ac225 8d5e102914281fe4b19b869f589d38bac129c760 Alexsander Akers <me@a2.io> 1492436996 +0200 commit: C
|
Binary file
|
Binary file
|
@@ -0,0 +1,19 @@
|
|
1
|
+
Merge commit
|
2
|
+
|
3
|
+
# Conflicts:
|
4
|
+
# file
|
5
|
+
#
|
6
|
+
# It looks like you may be committing a merge.
|
7
|
+
# If this is not correct, please remove the file
|
8
|
+
# .git/MERGE_HEAD
|
9
|
+
# and try again.
|
10
|
+
|
11
|
+
|
12
|
+
# Please enter the commit message for your changes. Lines starting
|
13
|
+
# with '#' will be ignored, and an empty message aborts the commit.
|
14
|
+
# On branch master
|
15
|
+
# All conflicts fixed but you are still merging.
|
16
|
+
#
|
17
|
+
# Changes to be committed:
|
18
|
+
# modified: file
|
19
|
+
#
|
@@ -0,0 +1 @@
|
|
1
|
+
ref: refs/heads/master
|
File without changes
|
@@ -0,0 +1 @@
|
|
1
|
+
9c64bab5028e6dfd053ee266e9b763f610e1dc53
|
@@ -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
|
+
commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
|
14
|
+
test -x "$commitmsg" && exec "$commitmsg" ${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
|
+
precommit="$(git rev-parse --git-path hooks/pre-commit)"
|
13
|
+
test -x "$precommit" && exec "$precommit" ${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,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
|
+
while read local_ref local_sha remote_ref remote_sha
|
28
|
+
do
|
29
|
+
if [ "$local_sha" = $z40 ]
|
30
|
+
then
|
31
|
+
# Handle delete
|
32
|
+
:
|
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 >&2 "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,24 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to make use of push options.
|
4
|
+
# The example simply echoes all push options that start with 'echoback='
|
5
|
+
# and rejects all pushes when the "reject" push option is used.
|
6
|
+
#
|
7
|
+
# To enable this hook, rename this file to "pre-receive".
|
8
|
+
|
9
|
+
if test -n "$GIT_PUSH_OPTION_COUNT"
|
10
|
+
then
|
11
|
+
i=0
|
12
|
+
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
|
13
|
+
do
|
14
|
+
eval "value=\$GIT_PUSH_OPTION_$i"
|
15
|
+
case "$value" in
|
16
|
+
echoback=*)
|
17
|
+
echo "echo from the pre-receive-hook: ${value#*=}" >&2
|
18
|
+
;;
|
19
|
+
reject)
|
20
|
+
exit 1
|
21
|
+
esac
|
22
|
+
i=$((i + 1))
|
23
|
+
done
|
24
|
+
fi
|