From 4b53c15896a9765e531b1a8ab6790777d9bcad75 Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Mon, 18 May 2020 14:40:14 -0600 Subject: [PATCH] initial --- game/basic/README.md | 3 + game/basic/git/COMMIT_EDITMSG | 1 + game/basic/git/HEAD | 1 + game/basic/git/config | 7 + game/basic/git/description | 1 + game/basic/git/hooks/applypatch-msg.sample | 15 ++ game/basic/git/hooks/commit-msg.sample | 24 +++ .../basic/git/hooks/fsmonitor-watchman.sample | 114 ++++++++++++ game/basic/git/hooks/post-update.sample | 8 + game/basic/git/hooks/pre-applypatch.sample | 14 ++ game/basic/git/hooks/pre-commit.sample | 49 +++++ game/basic/git/hooks/pre-push.sample | 53 ++++++ game/basic/git/hooks/pre-rebase.sample | 169 ++++++++++++++++++ game/basic/git/hooks/pre-receive.sample | 24 +++ .../basic/git/hooks/prepare-commit-msg.sample | 42 +++++ game/basic/git/hooks/update.sample | 128 +++++++++++++ game/basic/git/index | Bin 0 -> 137 bytes game/basic/git/info/exclude | 6 + game/basic/git/logs/HEAD | 1 + game/basic/git/logs/refs/heads/master | 1 + .../00/76607907d4e64dd8177a00a6b2852116c513d0 | Bin 0 -> 54 bytes .../82/63c8b6f1825595b0d22f83fdc0e4274eae1d51 | Bin 0 -> 134 bytes .../84/325bee4d912353bfca9b87f7d0a17ef9e60b22 | 2 + game/basic/git/refs/heads/master | 1 + questions/.gitignore | 3 + questions/README.md | 3 + questions/config/config.go | 51 ++++++ questions/git/COMMIT_EDITMSG | 1 + questions/git/HEAD | 1 + questions/git/config | 7 + questions/git/description | 1 + questions/git/hooks/applypatch-msg.sample | 15 ++ questions/git/hooks/commit-msg.sample | 24 +++ questions/git/hooks/fsmonitor-watchman.sample | 114 ++++++++++++ questions/git/hooks/post-update.sample | 8 + questions/git/hooks/pre-applypatch.sample | 14 ++ questions/git/hooks/pre-commit.sample | 49 +++++ questions/git/hooks/pre-push.sample | 53 ++++++ questions/git/hooks/pre-rebase.sample | 169 ++++++++++++++++++ questions/git/hooks/pre-receive.sample | 24 +++ questions/git/hooks/prepare-commit-msg.sample | 42 +++++ questions/git/hooks/update.sample | 128 +++++++++++++ questions/git/index | Bin 0 -> 1296 bytes questions/git/info/exclude | 6 + questions/git/logs/HEAD | 1 + questions/git/logs/refs/heads/master | 1 + .../1c/be5b4f9b31517dbc55b22fd3bd319511ce566e | Bin 0 -> 213 bytes .../29/ec01372414bf7b295510bf570f60519fd683db | Bin 0 -> 232 bytes .../36/9254316a3454531018c6d7d8573dad0066f914 | Bin 0 -> 342 bytes .../3a/5a9a45ebec9154067bac9521d0d2177a6e94cf | Bin 0 -> 468 bytes .../42/60ceab1cbd51f21609a096266e0331eaa1aaee | Bin 0 -> 54 bytes .../4c/23c9534516f2d9d145c3ba4a68b06091325cbe | 1 + .../4c/d85bb1b02ee495c738981b4db6103091428017 | Bin 0 -> 269 bytes .../4d/1849b1a5885820a92dff9d16a3cf0eee9d4d33 | Bin 0 -> 110 bytes .../4e/2dac93492855288da044e67221c54eeab47e43 | 2 + .../4f/3beb5ce6ec27c01b056fb1ec6330ea78d4a138 | Bin 0 -> 1151 bytes .../6b/d1fe3835d77f78691242924cc3f129f135e7a8 | Bin 0 -> 407 bytes .../6c/9aa16c804365d5d374cce094d85be92485cb6c | Bin 0 -> 159 bytes .../79/1f56c48f8c35996ad75cfd710cdb7697976f69 | Bin 0 -> 895 bytes .../b1/735867269049f230b87aba98edf9b63008312f | Bin 0 -> 135 bytes .../be/f2354ba5cb07a6b197dbf569aa8c2946bf13d0 | Bin 0 -> 85 bytes .../c4/3080052584baae55fdf38faae861e80d3a563d | Bin 0 -> 188 bytes .../d8/1af664b7b51f103732c15b897955afa494a5fa | Bin 0 -> 372 bytes .../ea/b6ff32f6690dae6f6208db0a7fa1cc71d8a3cd | Bin 0 -> 99 bytes .../f0/08850e160bc3d5ee7b0e0dcaabb883f5e5aef1 | Bin 0 -> 269 bytes questions/git/refs/heads/master | 1 + questions/main.go | 26 +++ questions/server/routes.go | 167 +++++++++++++++++ questions/server/server.go | 13 ++ questions/storage/answer.go | 35 ++++ questions/storage/answer_test.go | 34 ++++ questions/storage/id.go | 7 + questions/storage/one.go | 115 ++++++++++++ questions/storage/one_test.go | 83 +++++++++ questions/storage/pair.go | 36 ++++ questions/storage/question.go | 19 ++ questions/storage/question_test.go | 34 ++++ 77 files changed, 1952 insertions(+) create mode 100755 game/basic/README.md create mode 100755 game/basic/git/COMMIT_EDITMSG create mode 100755 game/basic/git/HEAD create mode 100755 game/basic/git/config create mode 100755 game/basic/git/description create mode 100755 game/basic/git/hooks/applypatch-msg.sample create mode 100755 game/basic/git/hooks/commit-msg.sample create mode 100755 game/basic/git/hooks/fsmonitor-watchman.sample create mode 100755 game/basic/git/hooks/post-update.sample create mode 100755 game/basic/git/hooks/pre-applypatch.sample create mode 100755 game/basic/git/hooks/pre-commit.sample create mode 100755 game/basic/git/hooks/pre-push.sample create mode 100755 game/basic/git/hooks/pre-rebase.sample create mode 100755 game/basic/git/hooks/pre-receive.sample create mode 100755 game/basic/git/hooks/prepare-commit-msg.sample create mode 100755 game/basic/git/hooks/update.sample create mode 100755 game/basic/git/index create mode 100755 game/basic/git/info/exclude create mode 100755 game/basic/git/logs/HEAD create mode 100755 game/basic/git/logs/refs/heads/master create mode 100755 game/basic/git/objects/00/76607907d4e64dd8177a00a6b2852116c513d0 create mode 100755 game/basic/git/objects/82/63c8b6f1825595b0d22f83fdc0e4274eae1d51 create mode 100755 game/basic/git/objects/84/325bee4d912353bfca9b87f7d0a17ef9e60b22 create mode 100755 game/basic/git/refs/heads/master create mode 100755 questions/.gitignore create mode 100755 questions/README.md create mode 100755 questions/config/config.go create mode 100755 questions/git/COMMIT_EDITMSG create mode 100755 questions/git/HEAD create mode 100755 questions/git/config create mode 100755 questions/git/description create mode 100755 questions/git/hooks/applypatch-msg.sample create mode 100755 questions/git/hooks/commit-msg.sample create mode 100755 questions/git/hooks/fsmonitor-watchman.sample create mode 100755 questions/git/hooks/post-update.sample create mode 100755 questions/git/hooks/pre-applypatch.sample create mode 100755 questions/git/hooks/pre-commit.sample create mode 100755 questions/git/hooks/pre-push.sample create mode 100755 questions/git/hooks/pre-rebase.sample create mode 100755 questions/git/hooks/pre-receive.sample create mode 100755 questions/git/hooks/prepare-commit-msg.sample create mode 100755 questions/git/hooks/update.sample create mode 100755 questions/git/index create mode 100755 questions/git/info/exclude create mode 100755 questions/git/logs/HEAD create mode 100755 questions/git/logs/refs/heads/master create mode 100755 questions/git/objects/1c/be5b4f9b31517dbc55b22fd3bd319511ce566e create mode 100755 questions/git/objects/29/ec01372414bf7b295510bf570f60519fd683db create mode 100755 questions/git/objects/36/9254316a3454531018c6d7d8573dad0066f914 create mode 100755 questions/git/objects/3a/5a9a45ebec9154067bac9521d0d2177a6e94cf create mode 100755 questions/git/objects/42/60ceab1cbd51f21609a096266e0331eaa1aaee create mode 100755 questions/git/objects/4c/23c9534516f2d9d145c3ba4a68b06091325cbe create mode 100755 questions/git/objects/4c/d85bb1b02ee495c738981b4db6103091428017 create mode 100755 questions/git/objects/4d/1849b1a5885820a92dff9d16a3cf0eee9d4d33 create mode 100755 questions/git/objects/4e/2dac93492855288da044e67221c54eeab47e43 create mode 100755 questions/git/objects/4f/3beb5ce6ec27c01b056fb1ec6330ea78d4a138 create mode 100755 questions/git/objects/6b/d1fe3835d77f78691242924cc3f129f135e7a8 create mode 100755 questions/git/objects/6c/9aa16c804365d5d374cce094d85be92485cb6c create mode 100755 questions/git/objects/79/1f56c48f8c35996ad75cfd710cdb7697976f69 create mode 100755 questions/git/objects/b1/735867269049f230b87aba98edf9b63008312f create mode 100755 questions/git/objects/be/f2354ba5cb07a6b197dbf569aa8c2946bf13d0 create mode 100755 questions/git/objects/c4/3080052584baae55fdf38faae861e80d3a563d create mode 100755 questions/git/objects/d8/1af664b7b51f103732c15b897955afa494a5fa create mode 100755 questions/git/objects/ea/b6ff32f6690dae6f6208db0a7fa1cc71d8a3cd create mode 100755 questions/git/objects/f0/08850e160bc3d5ee7b0e0dcaabb883f5e5aef1 create mode 100755 questions/git/refs/heads/master create mode 100755 questions/main.go create mode 100755 questions/server/routes.go create mode 100755 questions/server/server.go create mode 100755 questions/storage/answer.go create mode 100755 questions/storage/answer_test.go create mode 100755 questions/storage/id.go create mode 100755 questions/storage/one.go create mode 100755 questions/storage/one_test.go create mode 100755 questions/storage/pair.go create mode 100755 questions/storage/question.go create mode 100755 questions/storage/question_test.go diff --git a/game/basic/README.md b/game/basic/README.md new file mode 100755 index 0000000..84325be --- /dev/null +++ b/game/basic/README.md @@ -0,0 +1,3 @@ +# Game-Show/Game/Basic + +Server to prompt basic HTTP forms for sharing questions and gathering answers diff --git a/game/basic/git/COMMIT_EDITMSG b/game/basic/git/COMMIT_EDITMSG new file mode 100755 index 0000000..9823e78 --- /dev/null +++ b/game/basic/git/COMMIT_EDITMSG @@ -0,0 +1 @@ +Initial Commit diff --git a/game/basic/git/HEAD b/game/basic/git/HEAD new file mode 100755 index 0000000..cb089cd --- /dev/null +++ b/game/basic/git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/game/basic/git/config b/game/basic/git/config new file mode 100755 index 0000000..6c9406b --- /dev/null +++ b/game/basic/git/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true diff --git a/game/basic/git/description b/game/basic/git/description new file mode 100755 index 0000000..498b267 --- /dev/null +++ b/game/basic/git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/game/basic/git/hooks/applypatch-msg.sample b/game/basic/git/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/game/basic/git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/game/basic/git/hooks/commit-msg.sample b/game/basic/git/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/game/basic/git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/game/basic/git/hooks/fsmonitor-watchman.sample b/game/basic/git/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..e673bb3 --- /dev/null +++ b/game/basic/git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,114 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $time) = @ARGV; + +# Check the hook interface version + +if ($version == 1) { + # convert nanoseconds to seconds + $time = int $time / 1000000000; +} else { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} + +my $retry = 1; + +launch_watchman(); + +sub launch_watchman { + + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $time but were not transient (ie created after + # $time but no longer exist). + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + # + # The category of transient files that we want to ignore will have a + # creation clock (cclock) newer than $time_t value and will also not + # currently exist. + + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $time, + "fields": ["name"], + "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + }] + END + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); + + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; + $retry--; + qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + print "/\0"; + eval { launch_watchman() }; + exit 0; + } + + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; + + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; +} diff --git a/game/basic/git/hooks/post-update.sample b/game/basic/git/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/game/basic/git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/game/basic/git/hooks/pre-applypatch.sample b/game/basic/git/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/game/basic/git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/game/basic/git/hooks/pre-commit.sample b/game/basic/git/hooks/pre-commit.sample new file mode 100755 index 0000000..6a75641 --- /dev/null +++ b/game/basic/git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/game/basic/git/hooks/pre-push.sample b/game/basic/git/hooks/pre-push.sample new file mode 100755 index 0000000..6187dbf --- /dev/null +++ b/game/basic/git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/game/basic/git/hooks/pre-rebase.sample b/game/basic/git/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/game/basic/git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/game/basic/git/hooks/pre-receive.sample b/game/basic/git/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/game/basic/git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/game/basic/git/hooks/prepare-commit-msg.sample b/game/basic/git/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/game/basic/git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/game/basic/git/hooks/update.sample b/game/basic/git/hooks/update.sample new file mode 100755 index 0000000..80ba941 --- /dev/null +++ b/game/basic/git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/game/basic/git/index b/game/basic/git/index new file mode 100755 index 0000000000000000000000000000000000000000..07c1a84d56a2dca95e1f4f221238764a7a690a0b GIT binary patch literal 137 zcmZ?q402{*U|<4b#<<{rF@mQwmVoI)$x|5_7+4s#Iy_-uXj}r6{t8qh0>o)8M$zwl zCn^W;KQ+7k`-O#dKc8_cF>nUCI=c9}>gA>|gao;|0@X<}7%CWWF_a}#vR`@Tdqcd6 iVcDiuMX{s87dG9KJ`!I%@uRC%yK!7&e}vqe6|4YV1};Vb literal 0 HcmV?d00001 diff --git a/game/basic/git/info/exclude b/game/basic/git/info/exclude new file mode 100755 index 0000000..a5196d1 --- /dev/null +++ b/game/basic/git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/game/basic/git/logs/HEAD b/game/basic/git/logs/HEAD new file mode 100755 index 0000000..9b00696 --- /dev/null +++ b/game/basic/git/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 8263c8b6f1825595b0d22f83fdc0e4274eae1d51 Bel LaPointe 1582562913 -0700 commit (initial): Initial Commit diff --git a/game/basic/git/logs/refs/heads/master b/game/basic/git/logs/refs/heads/master new file mode 100755 index 0000000..9b00696 --- /dev/null +++ b/game/basic/git/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 8263c8b6f1825595b0d22f83fdc0e4274eae1d51 Bel LaPointe 1582562913 -0700 commit (initial): Initial Commit diff --git a/game/basic/git/objects/00/76607907d4e64dd8177a00a6b2852116c513d0 b/game/basic/git/objects/00/76607907d4e64dd8177a00a6b2852116c513d0 new file mode 100755 index 0000000000000000000000000000000000000000..c4be4d9b31e9bbac2714546b6415b3665fbdd734 GIT binary patch literal 54 zcmb9mI3+X1=*U`+=*=pfmP96KQW1sU`PDjHQ-Oznw!CqIWgUrfdGEe( o&*5_lt)79jliJ9c6dchaib2Pd(|@+OZ<(_%aQkJ%7xfW3ahb9|p8x;= literal 0 HcmV?d00001 diff --git a/game/basic/git/objects/84/325bee4d912353bfca9b87f7d0a17ef9e60b22 b/game/basic/git/objects/84/325bee4d912353bfca9b87f7d0a17ef9e60b22 new file mode 100755 index 0000000..2cb8605 --- /dev/null +++ b/game/basic/git/objects/84/325bee4d912353bfca9b87f7d0a17ef9e60b22 @@ -0,0 +1,2 @@ +x10 Fa◘QG#Rr&GayzG"ntƝ +_|c7LdgYJYbw\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/questions/git/hooks/fsmonitor-watchman.sample b/questions/git/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..e673bb3 --- /dev/null +++ b/questions/git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,114 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $time) = @ARGV; + +# Check the hook interface version + +if ($version == 1) { + # convert nanoseconds to seconds + $time = int $time / 1000000000; +} else { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} + +my $retry = 1; + +launch_watchman(); + +sub launch_watchman { + + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $time but were not transient (ie created after + # $time but no longer exist). + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + # + # The category of transient files that we want to ignore will have a + # creation clock (cclock) newer than $time_t value and will also not + # currently exist. + + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $time, + "fields": ["name"], + "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + }] + END + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); + + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; + $retry--; + qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + print "/\0"; + eval { launch_watchman() }; + exit 0; + } + + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; + + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; +} diff --git a/questions/git/hooks/post-update.sample b/questions/git/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/questions/git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/questions/git/hooks/pre-applypatch.sample b/questions/git/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/questions/git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/questions/git/hooks/pre-commit.sample b/questions/git/hooks/pre-commit.sample new file mode 100755 index 0000000..6a75641 --- /dev/null +++ b/questions/git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/questions/git/hooks/pre-push.sample b/questions/git/hooks/pre-push.sample new file mode 100755 index 0000000..6187dbf --- /dev/null +++ b/questions/git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/questions/git/hooks/pre-rebase.sample b/questions/git/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/questions/git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/questions/git/hooks/pre-receive.sample b/questions/git/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/questions/git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/questions/git/hooks/prepare-commit-msg.sample b/questions/git/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/questions/git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/questions/git/hooks/update.sample b/questions/git/hooks/update.sample new file mode 100755 index 0000000..80ba941 --- /dev/null +++ b/questions/git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/questions/git/index b/questions/git/index new file mode 100755 index 0000000000000000000000000000000000000000..7a937d6b39d6227c96f68d7fdc4b62a130a5103d GIT binary patch literal 1296 zcmZ?q402{*U|<4bzPJ!?4NZ4{7cgx=@Q0}I1;MH2>w#w834j9-CjM1WYyNBLy1 ztJtTT7hMnU^2*qdFwrPx9|Mn9qbpF&W899nD$7n z1e>#6_A;tDynp?zU&lOqqkce|HGkuqWP?`~R~A|@2o$Flm8BNx7v-0hq!vTnCH#{o zb&-2q2#`+N;sbHlk$0%(G0fjs9FeXz!Sj>Bj;dWV-u~QXz+tElHxFVg)I3*5)mHvZ zaUnpu@pT~Bylww7P|ahiy&?52W&2in0du2+(Vdl{>z7Pf`inuZxFo+QF+Ej3F|W8h zwFqQjT!`m4WA;CXK(x_+Mg@p}rM9A(=kkH0l~0WO@YQ$Ke7vVt?`Zz|blpb=F;w&7 zfu1gb1S8N~AuDU~!0ljK#C0CT-@7VM&1FdQmGIoSv?D@crSAW^VvEo7y_@T6%)kpX zH!}rl9MC)uQ<0MSSHN^p93ju+rD>T98ZM!amY96EF5rYO+)s|iBLjQj5U-csK1+P_@EyA6J zrNEfU%!j6NP(}v&Tatgq7ht&nq$mCmgt${i3DsOCADJV>TxFjO$$ za!NS2T4rzHCo#?i)70{q4PPx>^$wEO8H|9^`#za^FFnn^Y~%FXUo%(rXu9nez5unE y!2&4nr@Lmdr$(qo?*f-+MT$rLUTvv!=2Wx^nUHd;sC|oQLu1a4^k?PomH+@J465n? literal 0 HcmV?d00001 diff --git a/questions/git/info/exclude b/questions/git/info/exclude new file mode 100755 index 0000000..a5196d1 --- /dev/null +++ b/questions/git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/questions/git/logs/HEAD b/questions/git/logs/HEAD new file mode 100755 index 0000000..f18a833 --- /dev/null +++ b/questions/git/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6c9aa16c804365d5d374cce094d85be92485cb6c Bel LaPointe 1582582655 -0700 commit (initial): Create, cat, delete, and check individual questions diff --git a/questions/git/logs/refs/heads/master b/questions/git/logs/refs/heads/master new file mode 100755 index 0000000..f18a833 --- /dev/null +++ b/questions/git/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6c9aa16c804365d5d374cce094d85be92485cb6c Bel LaPointe 1582582655 -0700 commit (initial): Create, cat, delete, and check individual questions diff --git a/questions/git/objects/1c/be5b4f9b31517dbc55b22fd3bd319511ce566e b/questions/git/objects/1c/be5b4f9b31517dbc55b22fd3bd319511ce566e new file mode 100755 index 0000000000000000000000000000000000000000..ebdebb44a669684e4df220535a52a5c932316fb0 GIT binary patch literal 213 zcmV;`04o1@0V^p=O;s>5G+;0^FfcPQQP4}zEXhpI%P&f0@KHV)>?-!@=0(@TySy?s zBuq4l*#}h>#CQV!tiR_f1_`iyzBClIBs**FFaFtWARxN10YaH&d*EBOlNRP zIJa76Z{Q~}&IQxd@|X=@EnM{uYD#WmW}aSpK7-~PMspRB{neVG0{g@H69VU7YrYLJ zqd2vwEVYPX-zQV=rKj1KZJd7lYv!sRO}G8R7oZAC@{1DFQyKhp*G%@*2-WCa;PR|U P@u=UcEp^TScnVdLBDra~ literal 0 HcmV?d00001 diff --git a/questions/git/objects/29/ec01372414bf7b295510bf570f60519fd683db b/questions/git/objects/29/ec01372414bf7b295510bf570f60519fd683db new file mode 100755 index 0000000000000000000000000000000000000000..5dea4d7c42fde3426ed3b7752f36094fdbdeee5e GIT binary patch literal 232 zcmVfX8_Dm*#VVn5@UxXpg-$ z{7)uA_<~TF1w}~BIi-}ki!-ueg^At|vv%l-QuL+dg{Muk?3 zxj9d-loX3k->`Mw)UUx}>IFa8m;fyr=8-)_Uj1fxfh1(T i@49^JW|bdM7ttQO_xvNVrrs3Q8s*j{SNa3~hKz)HBysrw literal 0 HcmV?d00001 diff --git a/questions/git/objects/36/9254316a3454531018c6d7d8573dad0066f914 b/questions/git/objects/36/9254316a3454531018c6d7d8573dad0066f914 new file mode 100755 index 0000000000000000000000000000000000000000..10a93eb5f7d26c3ce25adccd23e92b7d579924fe GIT binary patch literal 342 zcmV-c0jd6Y0fmuIPlGTR#=X){@ycNVLzwa40mE(6Oq01}?qp2XvW`_*TT4+Fv+wTP z0&bcZPw@Wfug~+8Rf@so#rcV*#S1Mt)K(e%5+b%*84D2!!cy2x!_q=+hpZ{N89vua zYHDh3LJ|{VcbdbD3WKLjQ&{*U!DIyBN+C;Fy8SE^t8htz2mWDy4J@{Bv?pZU$O5MP zJrb(~T)W$hTRd_Nw~dj$#LCk$znNe)8D)4Yo+ZKl8y9IfbK+uH$SsQA(CT)6KaChX zKCzwUF>qs)aiZU-aYfr8fmlPG_(qn)!E<`U?c6(ySbXK@c@9!k4iV@St>;kVZ>JR} zPLIRs)Y)&De<2eHeIOnB^nmVosPMp>jQ*uz?mt0R`<9+~PN3=?hx9=|rUsw35vOevp9cSHlmr0`w704F-e;Ph*zSO5S3 literal 0 HcmV?d00001 diff --git a/questions/git/objects/3a/5a9a45ebec9154067bac9521d0d2177a6e94cf b/questions/git/objects/3a/5a9a45ebec9154067bac9521d0d2177a6e94cf new file mode 100755 index 0000000000000000000000000000000000000000..d7c9a4a6a9bc3066a1569b4613c5854195b6066d GIT binary patch literal 468 zcmV;_0W1D^0gY3^Zlf>|?Unh8S){5UMQo$Jw2^X18f}$JR5kel1BOKlwq=_})hhqq z83RhQD`k5DX2y^4d-Eo5b&m7<`NNG7#cxqdEVQbc8ldTnwjL9R;;Qp8y;@y}_PemP zJ4eoIOQ;x90RL_zJ_R^BZ~MaIABa|EX*q0E4bf(eNI}44n>CyO-h>@{j#z-IR|W3m zF-cKct1bUVI9x1|n`cy6*?KR1l5##<86#DhgxYp@m|<*Ue(?3Z#s%d!;k(Iu;in9=% zAS&}&I6>2y2Fs(PgHw1QU;MPX+XoXQG_hxz9c!KP*O*Sz8DY-Fpw7jC%X;8{r5=d> zUH=N9<6yO657?y9@QKUOpezErdV#bU+1`+~eU-$ETh?(RKz?CzTSYDn%r@%2jiR3}|0^)|8+ed~9Vujm?6k1{9QT~LJ2)1l=Go5X6T(_+%)#{rIu Keu59~Ry6^&O6o@d literal 0 HcmV?d00001 diff --git a/questions/git/objects/42/60ceab1cbd51f21609a096266e0331eaa1aaee b/questions/git/objects/42/60ceab1cbd51f21609a096266e0331eaa1aaee new file mode 100755 index 0000000000000000000000000000000000000000..9cde9bf94d22cfabfe1b4e8e3995857b83ab6309 GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bxNY2ko%S_ix&u6fTn&tZX&BPG4>NQgpFI*C@ M%A0Z?08GUZ8c8V@rvLx| literal 0 HcmV?d00001 diff --git a/questions/git/objects/4c/23c9534516f2d9d145c3ba4a68b06091325cbe b/questions/git/objects/4c/23c9534516f2d9d145c3ba4a68b06091325cbe new file mode 100755 index 0000000..523ca27 --- /dev/null +++ b/questions/git/objects/4c/23c9534516f2d9d145c3ba4a68b06091325cbe @@ -0,0 +1 @@ +xKOR06a+.*,M-.+JHMEp \ No newline at end of file diff --git a/questions/git/objects/4c/d85bb1b02ee495c738981b4db6103091428017 b/questions/git/objects/4c/d85bb1b02ee495c738981b4db6103091428017 new file mode 100755 index 0000000000000000000000000000000000000000..a7a36232ec36ff536f1fd04c4bd5c31c02afe028 GIT binary patch literal 269 zcmV+o0rLKM0lkq=Ps1<_#knS*!sLJ&G?f$5G_>1}=?!{P;325RzwtCV)T^MN3dLK#>1(z?~vruI&8gG^0) zR#Hp3+`9rYZalgzhI)6Fk&c3OwLYBPgN)`$u9!ZTwIyC1^GoK3QFmjB^jkjddc~@ z`sw-k={c$TrKOoEN?crNrFqE;eyQc2E*hFZZAF=R=?c|coJFZ6rA2uPAVqpWSq)9S QV6dEqCRZ&N04pIRy^#Me!vFvP literal 0 HcmV?d00001 diff --git a/questions/git/objects/4e/2dac93492855288da044e67221c54eeab47e43 b/questions/git/objects/4e/2dac93492855288da044e67221c54eeab47e43 new file mode 100755 index 0000000..7791d8d --- /dev/null +++ b/questions/git/objects/4e/2dac93492855288da044e67221c54eeab47e43 @@ -0,0 +1,2 @@ +x+)JMU060f040031QH+.O-Kg!-eVysѝLY EQ|Ijq HV>1WUZu*3S@ +|%<7.PX|C祂TTʇ1u=o!3*6e_gaz"SiᏚM*+H;lRaIHı7m2*),:83?dVՖ]B~_"U-2>77n{2 imIzA \ No newline at end of file diff --git a/questions/git/objects/4f/3beb5ce6ec27c01b056fb1ec6330ea78d4a138 b/questions/git/objects/4f/3beb5ce6ec27c01b056fb1ec6330ea78d4a138 new file mode 100755 index 0000000000000000000000000000000000000000..ab521dfa323a8e8e7439e19646688019d5d7de72 GIT binary patch literal 1151 zcmV-_1c3W^0o7M+Z`(Ey-dE{YumW00okOo11{Ci6VR>5ubnTF==!Yy=Y3XEZmPwbS z;-rE9`|e1+C9&5STRsd(V3R!F%X7~i&y!M3*bhIxe)Y{#q;oL^W`Y2T@%HdQjV9(6dYWTSVV+$qCFjX=yrvEHstkP((C-kLQ z&a7Q_J6cs1G_JErEzN49y~`5pu(`Grb~en566g!*F;=7FCJK`<%qy9)*sz!9F2sbL zk$Mv+47667-G+fPXxM1XE-vwEm0H>jNE>6!E5r2y>`Y~htnw2fvl8?%Di4D-Nz=c( zGQv9u6+d616E=^dRD-Y(B?FT1N=9soVaJC1Gk3J6^X*zPD8a(;xrqkMBg8)zWtIw^ zZPe`LAEUV}jNR-VojgWED(vGOL*Ym1oIyI@K`V*3de>o)V{ZSfp`z4kA(7{GstIOH zKkXa-bC$(!pHs%`E8Hh4LBS#?s<3BcCX3QBBhX+gEomFi(HQ>KTPPB)Yu33O=Sn@G zO!8pI(aiv6qg1XW*(Xao(VRWXT;I2pMa?9ZbJaeC^RY zSj8)fC&(ZNjR*XoR0d+Vw_+sfqoIhKa^gqVHrD*Z*<1b_qLZ-km_4=3JE(^+fD4M76tiqD5san~5u6f|*(pv2s#hF^QR(w82qh=D#AU zGf~E9IeBxRsCNx-3-A!yn7`g9wqc{FZez{P~-Z4JQ=Yz!HAF4jwtr&f?RAdEtT&;7(z!8Y@+ROLp|r6vd5~DS=TL^ou)Z%sm9); z^xxEa7;Mi1wU~{hOX>051+S^HEkIA&qE|w8mYP(cb?jCDk8G$p5sSj$2M%R)9zEaE z3$NDH3FlpwT5#_V4skt8^Y=AZl^+|BradNy!IjX=RFg$vaS(Q+JKYGI>8T;hA^4Kj zd|zcZ_$s({{K8-LP?KupYvd;fe}Z|y!2?g|L2ZX9f94p{@~uf;k<}AV9xkrS?C z=w8VC4UL|xBI`2WE1!CP>#4k5dk<(%AsCSU4>1@s2f+uqsNZ2U{=yYXGZEtAZX_6O z{9ustzcQ%)3z@++<)Ho*!%u0WH-lZg8eQTOFr*m@o2QrmiGAmqM;%6lKZClVw42{9 RobHlg_+(^YyY}oP^+B_4_AFHhE(+4yj5cT0)}5GLZ^wVo@$8$uttPi+P#| ziVnq7h5wW|guJZ91V-o>3jU-dx>H-hc>(E;9M};{vJH3x81D$=AC0Eeql+z|?UcUN z-nCk5b}VE9jCy_n!fc(!M7rS;dInSXyR?7@+Gb;7y)y}k;DAjMD|!JgrEW+M)O{8U zCev3I+kOyk6}Pclrvqn*cdm2f=>S9&>p?8ly<-ZYNZ=4F%gGSfy}t!S6(iM<`)CdP zSd3W7GE;w-8*^c6x|@9b)X^m`4-(2~wY|dU_kv1Iv&A+FgxC5mS=ANfbp{SSd-fXeBf7YU*T{X$9!Jv_~3E|T0pXh3YD=GD8c5-l^QikTn zN6}Zcwpr~#?NUnZ3Txo`vBn+}@h6#qAG9dwE1<=4WL*pz--shL71Nzcr!zJ zo`Zlf?M@0aXmX71IE}8;s0Z%|(HS%O&iPJ{s5LS6JuAD(D;KzNgol0Rkc8pvYDK&* zn~hQetq02U1vH*aRgVb!c4%8w)4D1AAFb|%t#AWmr2)^8f5s*c^kRBLNIramuODF9 Nc$JXTs=j_%Nh|RiOymFn literal 0 HcmV?d00001 diff --git a/questions/git/objects/79/1f56c48f8c35996ad75cfd710cdb7697976f69 b/questions/git/objects/79/1f56c48f8c35996ad75cfd710cdb7697976f69 new file mode 100755 index 0000000000000000000000000000000000000000..e80750f44316cceb233ae800e13c55f1bb805945 GIT binary patch literal 895 zcmV-_1AzQ^0lijDPuoBc?KS=tgC&sNB2#f_C8`{%0xhisv{6q86+2!h3ywFj*F+KI zzjtOooOKchdMOHWvb*!KKADPALg4j$Rt!bT zi_y`2B?=!GvWcWeE=InG&k>j7I*Ep2a+K5~R;qK;xU5*|d!gsa#gxHSLEvRQl1!J;SwU__d5bV@p#uU3y+t7efdH zI(&;>L-<`xkjyyFzYnf1g9Oczg~WAMmZBs!JcHyA{-_Tw!bu;9jg}C7Wir5Rf98ju z$OihY?H_D$9n0~hkmsT<(lZOX1eR9}5SwiF`cUwkob^g3>#_h0Vx$gdfuF@ZXDLVl z881?p8Tlu$|A_xH|Bx^aAql-+8`dz58i~a80HsGZa)z_x-!R%V)o}@k*kFojk;qIr zPr~p;)ZMaFC>vdnm0|)Sx!)$Rw?vUxR#EyE`L#JQg}a%Ooh6}Tx68eb z7Ee`~Y*z0;^_Z$*Y_GQWg9BThPQ`bX^lNg=(;X3_@~7g&_U{8vb)t=UY>#ctd(QLx z;{odC;l-!z@cNzOTL#XIW(oU_DqO69NfBPwns%Vq&8Y^RS_Kfpm=OYX zv;mO%y4;yPCM3@1Mbi z0lWQS6^*@{8)IU5vJj1r7$iYa)4E`d+e*lZr6o<2-jQ)B5L1$D6J~0H%h}oKGgsK literal 0 HcmV?d00001 diff --git a/questions/git/objects/be/f2354ba5cb07a6b197dbf569aa8c2946bf13d0 b/questions/git/objects/be/f2354ba5cb07a6b197dbf569aa8c2946bf13d0 new file mode 100755 index 0000000000000000000000000000000000000000..057336795a6363ca931916b19280f98750852eb4 GIT binary patch literal 85 zcmV-b0IL6Z0V^p=O;s>AVK6i>Ff%bxD9SG_NiEh(&u8$rejW4djrsv;*8Gick_}!} rTv=!VRaBf>RF+xbl$Z>K18k1lXam2=x1vkA%iIP-jO;|W`*D%}^aPI=PS;05EQ zFJb`tv-pdIi)l;yZZ1`Uo6i!j+%sLu^h;7XGVV0$g qCpb~~xEf@B0?Qj)7|Ak^%nr!p&!2ANjwr8*>;avCt literal 0 HcmV?d00001 diff --git a/questions/git/objects/d8/1af664b7b51f103732c15b897955afa494a5fa b/questions/git/objects/d8/1af664b7b51f103732c15b897955afa494a5fa new file mode 100755 index 0000000000000000000000000000000000000000..39037af7061461e625f97efed883b280be63bbd9 GIT binary patch literal 372 zcmV-)0gL{40acMrPs1<_hPgJs!t^k;P<00+kcN5yjgNvfCJ-ltwzTuQK$lcWsxeLb z?s50=HIkHP+CZH62i8XkQxHw`N(szV!RlCDZzb{P+FR+ z@`;HHrZ;sK=VCj~>H?)Js;E>beG(Fq3$8R&64&f!LAlzYgarI1S{Q`hR|q%Fg8|pM zh6C~Dlu6>fvSOnl6QYEr{e0p}oAHg&og;BCyQWTPlQo%fhLYPhkkZ@vNad~QyLUKlaW^!sV7XWuD FBB#R zlUQQ0M^D2H-^{-EHm`gRH@DYkTP)siX`m(_xJqd^TOSCt6w0{5m)0$>*0pzv2V`pE zUdcqt#k(sYcVy!;|{uHUA=``FJvd3ry}>?tB8yR`FFq=>rm0 zn%5I4n)Vc?8A|}B1|ojZ9Whv#O|K8YJ0r2u<$`^; literal 0 HcmV?d00001 diff --git a/questions/git/refs/heads/master b/questions/git/refs/heads/master new file mode 100755 index 0000000..9c5934a --- /dev/null +++ b/questions/git/refs/heads/master @@ -0,0 +1 @@ +6c9aa16c804365d5d374cce094d85be92485cb6c diff --git a/questions/main.go b/questions/main.go new file mode 100755 index 0000000..29ec013 --- /dev/null +++ b/questions/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "local/game-show/questions/config" + "local/game-show/questions/server" + "log" + "net/http" +) + +func main() { + err := config.New() + if err != nil { + panic(err) + } + server, err := server.New() + if err != nil { + panic(err) + } + if err := server.Routes(); err != nil { + panic(err) + } + log.Printf("Listening on %s", config.Get().Addr) + if err := http.ListenAndServe(config.Get().Addr, server); err != nil { + panic(err) + } +} diff --git a/questions/server/routes.go b/questions/server/routes.go new file mode 100755 index 0000000..4f3beb5 --- /dev/null +++ b/questions/server/routes.go @@ -0,0 +1,167 @@ +package server + +import ( + "encoding/json" + "fmt" + "local/game-show/questions/config" + "local/game-show/questions/storage" + "local/gziphttp" + "local/router" + dbstorage "local/storage" + "net/http" + "path/filepath" + "strings" +) + +func (s *Server) Routes() error { + routes := []struct { + path string + method http.HandlerFunc + }{ + { + path: fmt.Sprintf("create"), + method: gzip(s.create), + }, + { + path: fmt.Sprintf("delete/%s", router.Wildcard), + method: gzip(s.delete), + }, + { + path: fmt.Sprintf("list"), + method: gzip(s.list), + }, + { + path: fmt.Sprintf("cat/%s", router.Wildcard), + method: gzip(s.cat), + }, + { + path: fmt.Sprintf("check/%s", router.Wildcard), + method: gzip(s.check), + }, + } + for _, route := range routes { + err := s.Add(route.path, route.method) + if err != nil { + return err + } + } + return nil +} + +func gzip(foo http.HandlerFunc) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + if gziphttp.Can(r) { + gz := gziphttp.New(w) + defer gz.Close() + w = gz + } + if filepath.Ext(r.URL.Path) == ".css" { + w.Header().Set("Content-Type", "text/css; charset=utf-8") + } + foo(w, r) + } +} + +func (s *Server) create(w http.ResponseWriter, r *http.Request) { + one, err := readOne(r) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + one.FillIDs() + if !one.HasSolution() { + http.Error(w, "must have a solution", http.StatusBadRequest) + return + } + if b, err := json.Marshal(one); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } else if err := config.Get().DB.Set(one.ID, b); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + fmt.Fprintf(w, `{"ok":%q}\n`, one.ID) +} + +func (s *Server) delete(w http.ResponseWriter, r *http.Request) { + key := key(r) + err := config.Get().DB.Set(key, nil) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + fmt.Fprintln(w, "{}") +} + +func (s *Server) list(w http.ResponseWriter, r *http.Request) { + keys, err := config.Get().DB.List(nil) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + if err := json.NewEncoder(w).Encode(keys); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } +} + +func (s *Server) cat(w http.ResponseWriter, r *http.Request) { + key := key(r) + one, err := loadOne(key) + if err == dbstorage.ErrNotFound { + http.NotFound(w, r) + return + } else if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + json.NewEncoder(w).Encode(one) +} + +func (s *Server) check(w http.ResponseWriter, r *http.Request) { + got, err := readOne(r) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + want, err := loadOne(got.ID) + if err == dbstorage.ErrNotFound { + http.NotFound(w, r) + return + } else if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + ok := want.Check(got) + fmt.Fprintf(w, `{"ok":%v}`, ok) +} + +func readOne(r *http.Request) (storage.One, error) { + key := key(r) + + var submit storage.One + err := json.NewDecoder(r.Body).Decode(&submit) + if key != "" { + submit.ID = key + } + + return submit, err +} + +func loadOne(id string) (storage.One, error) { + b, err := config.Get().DB.Get(id) + if err != nil { + return storage.One{}, err + } + var one storage.One + err = json.Unmarshal(b, &one) + return one, err +} + +func key(r *http.Request) string { + index := strings.Index(r.URL.Path[1:], "/") + if index < 0 { + return "" + } + return r.URL.Path[index+2:] +} diff --git a/questions/server/server.go b/questions/server/server.go new file mode 100755 index 0000000..b173586 --- /dev/null +++ b/questions/server/server.go @@ -0,0 +1,13 @@ +package server + +import ( + "local/router" +) + +type Server struct { + *router.Router +} + +func New() (*Server, error) { + return &Server{Router: router.New()}, nil +} diff --git a/questions/storage/answer.go b/questions/storage/answer.go new file mode 100755 index 0000000..d81af66 --- /dev/null +++ b/questions/storage/answer.go @@ -0,0 +1,35 @@ +package storage + +import ( + "encoding/json" + "strings" + + "github.com/buger/jsonparser" +) + +const prefix_answer = "answer_" + +type Answer struct { + Pair + Right bool `json:"right"` +} + +func NewAnswer(text string) Answer { + return Answer{Pair: New(prefix_answer+NewID(), text)} +} + +func IsAnswer(ID string) bool { + return strings.HasPrefix(ID, prefix_answer) +} + +func (a *Answer) UnmarshalJSON(b []byte) error { + if err := json.Unmarshal(b, &a.Pair); err != nil { + return err + } + if right, err := jsonparser.GetBoolean(b, "right"); err != nil && err != jsonparser.KeyPathNotFoundError { + return err + } else { + a.Right = right + } + return nil +} diff --git a/questions/storage/answer_test.go b/questions/storage/answer_test.go new file mode 100755 index 0000000..f008850 --- /dev/null +++ b/questions/storage/answer_test.go @@ -0,0 +1,34 @@ +package storage + +import ( + "encoding/json" + "testing" +) + +func TestUnmarshalAnswerObject(t *testing.T) { + raw := `{"text":"text here", "id":"id here"}` + var a Answer + if err := json.Unmarshal([]byte(raw), &a); err != nil { + t.Fatal(err) + } + if a.Text != "text here" { + t.Fatal(a.Text) + } + if a.ID != "id here" { + t.Fatal(a.ID) + } +} + +func TestUnmarshalAnswerString(t *testing.T) { + raw := `"text here"` + var a Answer + if err := json.Unmarshal([]byte(raw), &a); err != nil { + t.Fatal(err) + } + if a.ID != "text here" { + t.Fatal(a.ID) + } + if a.Text != "" { + t.Fatal(a.Text) + } +} diff --git a/questions/storage/id.go b/questions/storage/id.go new file mode 100755 index 0000000..4d1849b --- /dev/null +++ b/questions/storage/id.go @@ -0,0 +1,7 @@ +package storage + +import "github.com/google/uuid" + +func NewID() string { + return uuid.New().String() +} diff --git a/questions/storage/one.go b/questions/storage/one.go new file mode 100755 index 0000000..791f56c --- /dev/null +++ b/questions/storage/one.go @@ -0,0 +1,115 @@ +package storage + +import ( + "encoding/json" + "fmt" + "log" + + "github.com/buger/jsonparser" +) + +type One struct { + ID string `json:"id"` + Question Question `json:"q"` + Answers []Answer `json:"a"` +} + +func (one *One) UnmarshalJSON(b []byte) error { + if b, _, _, err := jsonparser.Get(b, "q"); err == jsonparser.KeyPathNotFoundError { + } else if err != nil { + return fmt.Errorf("failed to find question: %v: %q", err, b) + } else if err := json.Unmarshal(b, &one.Question); err != nil { + if err := json.Unmarshal([]byte(fmt.Sprintf("%q", b)), &one.Question); err != nil { + return fmt.Errorf("failed to parse question from obj: %v: %q", err, b) + } + } + + if b, _, _, err := jsonparser.Get(b, "a"); err == jsonparser.KeyPathNotFoundError { + } else if err != nil { + return fmt.Errorf("failed to find answers: %v: %q", err, b) + } else if err := json.Unmarshal(b, &one.Answers); err != nil { + return fmt.Errorf("failed to parse answers: %v: %q", err, b) + } + + if id, err := jsonparser.GetString(b, "id"); err != nil && err != jsonparser.KeyPathNotFoundError { + return fmt.Errorf("failed to parse id: %v: %q", err, b) + } else { + one.ID = id + } + + return nil +} + +func (one *One) FillIDs() { + if one.ID == "" { + one.ID = NewID() + } + if one.Question.ID == "" { + one.Question.ID = NewID() + } + for i := range one.Answers { + if one.Answers[i].ID == "" { + one.Answers[i].ID = NewID() + } + } +} + +func (one One) Check(two One) bool { + if !one.CheckQuestion(two) { + log.Println("question mismatch") + return false + } + if !one.CheckAnswers(two) { + log.Println("answer mismatch") + return false + } + return true +} + +func (one One) CheckQuestion(two One) bool { + log.Println(one.Question) + log.Println(two.Question) + log.Println(one.Question == (Question{})) + log.Println(two.Question == (Question{})) + log.Println(one.Question.Equals(two.Question.Pair)) + return one.Question == (Question{}) || two.Question == (Question{}) || one.Question.Equals(two.Question.Pair) +} + +func (one One) CheckAnswers(two One) bool { + log.Println(len(one.Answers), one.Answers) + log.Println(len(two.Answers), two.Answers) + if len(two.Answers) == 0 { + return false + } + for _, answer := range two.Answers { + log.Printf("%+v %s %v", answer, "with id", answer.ID) + oanswer := one.GetAnswer(answer.ID) + log.Println(" ", oanswer) + if oanswer == (Answer{}) { + return false + } + if !oanswer.Right { + return false + } + } + return true +} + +func (one One) GetAnswer(id string) Answer { + for _, answer := range one.Answers { + log.Println(" ", answer, "==", id) + if answer.ID == id { + return answer + } + } + return Answer{} +} + +func (one One) HasSolution() bool { + for i := range one.Answers { + if one.Answers[i].Right { + return true + } + } + return false +} diff --git a/questions/storage/one_test.go b/questions/storage/one_test.go new file mode 100755 index 0000000..6bd1fe3 --- /dev/null +++ b/questions/storage/one_test.go @@ -0,0 +1,83 @@ +package storage + +import ( + "encoding/json" + "testing" +) + +func TestOneStrings(t *testing.T) { + raw := `{ + "id":"my id", + "q":"my question", + "a":[ + "my answer 0", + "my answer 1" + ] + }` + var one One + if err := json.Unmarshal([]byte(raw), &one); err != nil { + t.Fatal(err) + } + if one.ID != "my id" { + t.Fatal(one.ID) + } + if one.Question.ID != "my question" { + t.Fatal(one.ID) + } + if len(one.Answers) != 2 { + t.Fatal(one.Answers) + } + if one.Answers[0].ID != "my answer 0" { + t.Fatal(one.Answers[0]) + } + if one.Answers[1].ID != "my answer 1" { + t.Fatal(one.Answers[1]) + } +} + +func TestOneObj(t *testing.T) { + raw := `{ + "id":"my id", + "q":{ + "text": "my question" + }, + "a":[ + {"text": "my answer 0"}, + {"text": "my answer 1"} + ] + }` + var one One + if err := json.Unmarshal([]byte(raw), &one); err != nil { + t.Fatal(err) + } + if one.ID != "my id" { + t.Fatal(one.ID) + } + if one.Question.Text != "my question" { + t.Fatal(one.Question) + } + if len(one.Answers) != 2 { + t.Fatal(one.Answers) + } + if one.Answers[0].Text != "my answer 0" { + t.Fatal(one.Answers[0]) + } + if one.Answers[1].Text != "my answer 1" { + t.Fatal(one.Answers[1]) + } +} + +func TestOneNonObj(t *testing.T) { + raw := `{ + "id":"my id", + "q": [], + "a":[ + [], + {} + ] + }` + var one One + if err := json.Unmarshal([]byte(raw), &one); err == nil { + t.Fatal(err, one) + } +} diff --git a/questions/storage/pair.go b/questions/storage/pair.go new file mode 100755 index 0000000..3692543 --- /dev/null +++ b/questions/storage/pair.go @@ -0,0 +1,36 @@ +package storage + +import ( + "github.com/buger/jsonparser" +) + +type Pair struct { + ID string `json:"id"` + Text string `json:"text"` +} + +func New(id, text string) Pair { + return Pair{ + Text: text, + ID: id, + } +} + +func (p *Pair) UnmarshalJSON(b []byte) error { + var err error + if s, err := jsonparser.GetString(b); err == nil { + p.ID = s + return nil + } + if p.Text, err = jsonparser.GetString(b, "text"); err != nil { + return err + } + if p.ID, err = jsonparser.GetString(b, "id"); err != nil && err != jsonparser.KeyPathNotFoundError { + return err + } + return nil +} + +func (p Pair) Equals(o Pair) bool { + return p == o +} diff --git a/questions/storage/question.go b/questions/storage/question.go new file mode 100755 index 0000000..c430800 --- /dev/null +++ b/questions/storage/question.go @@ -0,0 +1,19 @@ +package storage + +import ( + "strings" +) + +const prefix_question = "question_" + +type Question struct { + Pair +} + +func NewQuestion(text string) Question { + return Question{New(prefix_question+NewID(), text)} +} + +func IsQuestion(ID string) bool { + return strings.HasPrefix(ID, prefix_question) +} diff --git a/questions/storage/question_test.go b/questions/storage/question_test.go new file mode 100755 index 0000000..4cd85bb --- /dev/null +++ b/questions/storage/question_test.go @@ -0,0 +1,34 @@ +package storage + +import ( + "encoding/json" + "testing" +) + +func TestUnmarshalQuestionObject(t *testing.T) { + raw := `{"text":"text here", "id":"id here"}` + var a Question + if err := json.Unmarshal([]byte(raw), &a); err != nil { + t.Fatal(err) + } + if a.Text != "text here" { + t.Fatal(a.Text) + } + if a.ID != "id here" { + t.Fatal(a.ID) + } +} + +func TestUnmarshalQuestionString(t *testing.T) { + raw := `"text here"` + var a Question + if err := json.Unmarshal([]byte(raw), &a); err != nil { + t.Fatal(err) + } + if a.ID != "text here" { + t.Fatal(a.ID) + } + if a.Text != "" { + t.Fatal(a.Text) + } +}