Skip to content

Commit 29bbc55

Browse files
brycepgbrycepg
committed
Initilizing repository.
0 parents  commit 29bbc55

16 files changed

+567
-0
lines changed

‎.htaccess

Whitespace-only changes.

‎HEAD

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ref: refs/heads/master

‎description

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Unnamed repository; edit this file 'description' to name the repository.

‎firstlogo.png

1.93 KB
Loading

‎hometab.JPG

1.46 KB
Loading

‎hooks/applypatch-msg.sample

+15
Original file line numberDiff line numberDiff line change
@@ -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+
:

‎hooks/commit-msg.sample

+24
Original file line numberDiff line numberDiff line change
@@ -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+
}

‎hooks/post-update.sample

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/sh
2+
#
3+
# An example hook script to prepare a packed repository for use over
4+
# dumb transports.
5+
#
6+
# To enable this hook, rename this file to "post-update".
7+
8+
exec git update-server-info

‎hooks/pre-applypatch.sample

+14
Original file line numberDiff line numberDiff line change
@@ -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+
:

‎hooks/pre-commit.sample

+50
Original file line numberDiff line numberDiff line change
@@ -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 --

‎hooks/pre-rebase.sample

+169
Original file line numberDiff line numberDiff line change
@@ -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".

‎hooks/prepare-commit-msg.sample

+36
Original file line numberDiff line numberDiff line change
@@ -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 commit comments

Comments
 (0)