From 409d0117a2ce660e3baf5c172dc4bb878e65a187 Mon Sep 17 00:00:00 2001 From: Joe Tretter Date: Fri, 4 Sep 2020 14:52:20 -0500 Subject: [PATCH] add more detail to the compare script; add level 4 and 5 --- B_Compare.sh | 14 +- l4/0_repository/.gitignore | 1 + l4/0_repository/COMMIT_EDITMSG | 1 + l4/0_repository/HEAD | 1 + l4/0_repository/config | 5 + l4/0_repository/description | 1 + l4/0_repository/hooks/applypatch-msg.sample | 15 ++ l4/0_repository/hooks/commit-msg.sample | 24 +++ .../hooks/fsmonitor-watchman.sample | 109 +++++++++++ l4/0_repository/hooks/post-update.sample | 8 + l4/0_repository/hooks/pre-applypatch.sample | 14 ++ l4/0_repository/hooks/pre-commit.sample | 49 +++++ l4/0_repository/hooks/pre-merge-commit.sample | 13 ++ l4/0_repository/hooks/pre-push.sample | 53 ++++++ l4/0_repository/hooks/pre-rebase.sample | 169 ++++++++++++++++++ l4/0_repository/hooks/pre-receive.sample | 24 +++ .../hooks/prepare-commit-msg.sample | 42 +++++ l4/0_repository/hooks/update.sample | 128 +++++++++++++ l4/0_repository/index | Bin 0 -> 145 bytes l4/0_repository/info/exclude | 6 + l4/0_repository/logs/HEAD | 4 + l4/0_repository/logs/refs/heads/master | 4 + .../3d/d7b2f2e093df4e7c06e3d8941780cf953f48ed | Bin 0 -> 47 bytes .../74/9b47e753ea5c6f7ec8bfb6734f30c1707f13bc | Bin 0 -> 90 bytes .../a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 | 2 + .../b8/d5084ee89c38e789e9b052ac3eac3c42b9b302 | Bin 0 -> 94 bytes .../b9/2b78fc1ac6bb6e90a1bc74344faaab18008799 | Bin 0 -> 34 bytes .../c5/ecb9b43b7faf3d211c6959fae18fcb6b87d1cc | Bin 0 -> 69 bytes .../c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 | 1 + .../e7/0e00704aae84401a4301f50b755c5f2b22059a | Bin 0 -> 55 bytes .../e9/16b8c6be7c02ddfcf66837c2b3ade94151b8d5 | Bin 0 -> 170 bytes .../ed/59e80b5e63131df2c0c7e89a1893b0d349107d | Bin 0 -> 55 bytes .../fe/036d759ff6f26e3b860abcc86f677f83bcb7bf | 1 + l4/0_repository/refs/heads/master | 1 + l4/1_overlay/README | 1 + l4/1_overlay/_Instructions.txt | 2 + l4/1_overlay/myScript.sh | 2 + l4/1_overlay/test/testing.txt | 1 + l4/3_workprep.sh | 3 + l4/5_solution.sh | 3 + l5/0_repository/.gitignore | 1 + l5/0_repository/COMMIT_EDITMSG | 1 + l5/0_repository/HEAD | 1 + l5/0_repository/config | 5 + l5/0_repository/description | 1 + l5/0_repository/hooks/applypatch-msg.sample | 15 ++ l5/0_repository/hooks/commit-msg.sample | 24 +++ .../hooks/fsmonitor-watchman.sample | 109 +++++++++++ l5/0_repository/hooks/post-update.sample | 8 + l5/0_repository/hooks/pre-applypatch.sample | 14 ++ l5/0_repository/hooks/pre-commit.sample | 49 +++++ l5/0_repository/hooks/pre-merge-commit.sample | 13 ++ l5/0_repository/hooks/pre-push.sample | 53 ++++++ l5/0_repository/hooks/pre-rebase.sample | 169 ++++++++++++++++++ l5/0_repository/hooks/pre-receive.sample | 24 +++ .../hooks/prepare-commit-msg.sample | 42 +++++ l5/0_repository/hooks/update.sample | 128 +++++++++++++ l5/0_repository/index | Bin 0 -> 145 bytes l5/0_repository/info/exclude | 6 + l5/0_repository/logs/HEAD | 4 + l5/0_repository/logs/refs/heads/master | 4 + .../3d/d7b2f2e093df4e7c06e3d8941780cf953f48ed | Bin 0 -> 47 bytes .../74/9b47e753ea5c6f7ec8bfb6734f30c1707f13bc | Bin 0 -> 90 bytes .../a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 | 2 + .../b8/d5084ee89c38e789e9b052ac3eac3c42b9b302 | Bin 0 -> 94 bytes .../b9/2b78fc1ac6bb6e90a1bc74344faaab18008799 | Bin 0 -> 34 bytes .../c5/ecb9b43b7faf3d211c6959fae18fcb6b87d1cc | Bin 0 -> 69 bytes .../c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 | 1 + .../e7/0e00704aae84401a4301f50b755c5f2b22059a | Bin 0 -> 55 bytes .../e9/16b8c6be7c02ddfcf66837c2b3ade94151b8d5 | Bin 0 -> 170 bytes .../ed/59e80b5e63131df2c0c7e89a1893b0d349107d | Bin 0 -> 55 bytes .../fe/036d759ff6f26e3b860abcc86f677f83bcb7bf | 1 + l5/0_repository/refs/heads/master | 1 + l5/1_overlay/README | 1 + l5/1_overlay/_Instructions.txt | 1 + l5/1_overlay/myScript.sh | 2 + l5/1_overlay/test/testing.txt | 1 + l5/3_workprep.sh | 3 + l5/5_solution.sh | 3 + 79 files changed, 1387 insertions(+), 2 deletions(-) create mode 100644 l4/0_repository/.gitignore create mode 100644 l4/0_repository/COMMIT_EDITMSG create mode 100644 l4/0_repository/HEAD create mode 100644 l4/0_repository/config create mode 100644 l4/0_repository/description create mode 100755 l4/0_repository/hooks/applypatch-msg.sample create mode 100755 l4/0_repository/hooks/commit-msg.sample create mode 100755 l4/0_repository/hooks/fsmonitor-watchman.sample create mode 100755 l4/0_repository/hooks/post-update.sample create mode 100755 l4/0_repository/hooks/pre-applypatch.sample create mode 100755 l4/0_repository/hooks/pre-commit.sample create mode 100755 l4/0_repository/hooks/pre-merge-commit.sample create mode 100755 l4/0_repository/hooks/pre-push.sample create mode 100755 l4/0_repository/hooks/pre-rebase.sample create mode 100755 l4/0_repository/hooks/pre-receive.sample create mode 100755 l4/0_repository/hooks/prepare-commit-msg.sample create mode 100755 l4/0_repository/hooks/update.sample create mode 100644 l4/0_repository/index create mode 100644 l4/0_repository/info/exclude create mode 100644 l4/0_repository/logs/HEAD create mode 100644 l4/0_repository/logs/refs/heads/master create mode 100644 l4/0_repository/objects/3d/d7b2f2e093df4e7c06e3d8941780cf953f48ed create mode 100644 l4/0_repository/objects/74/9b47e753ea5c6f7ec8bfb6734f30c1707f13bc create mode 100644 l4/0_repository/objects/a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 create mode 100644 l4/0_repository/objects/b8/d5084ee89c38e789e9b052ac3eac3c42b9b302 create mode 100644 l4/0_repository/objects/b9/2b78fc1ac6bb6e90a1bc74344faaab18008799 create mode 100644 l4/0_repository/objects/c5/ecb9b43b7faf3d211c6959fae18fcb6b87d1cc create mode 100644 l4/0_repository/objects/c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 create mode 100644 l4/0_repository/objects/e7/0e00704aae84401a4301f50b755c5f2b22059a create mode 100644 l4/0_repository/objects/e9/16b8c6be7c02ddfcf66837c2b3ade94151b8d5 create mode 100644 l4/0_repository/objects/ed/59e80b5e63131df2c0c7e89a1893b0d349107d create mode 100644 l4/0_repository/objects/fe/036d759ff6f26e3b860abcc86f677f83bcb7bf create mode 100644 l4/0_repository/refs/heads/master create mode 100644 l4/1_overlay/README create mode 100644 l4/1_overlay/_Instructions.txt create mode 100644 l4/1_overlay/myScript.sh create mode 100644 l4/1_overlay/test/testing.txt create mode 100755 l4/3_workprep.sh create mode 100755 l4/5_solution.sh create mode 100644 l5/0_repository/.gitignore create mode 100644 l5/0_repository/COMMIT_EDITMSG create mode 100644 l5/0_repository/HEAD create mode 100644 l5/0_repository/config create mode 100644 l5/0_repository/description create mode 100755 l5/0_repository/hooks/applypatch-msg.sample create mode 100755 l5/0_repository/hooks/commit-msg.sample create mode 100755 l5/0_repository/hooks/fsmonitor-watchman.sample create mode 100755 l5/0_repository/hooks/post-update.sample create mode 100755 l5/0_repository/hooks/pre-applypatch.sample create mode 100755 l5/0_repository/hooks/pre-commit.sample create mode 100755 l5/0_repository/hooks/pre-merge-commit.sample create mode 100755 l5/0_repository/hooks/pre-push.sample create mode 100755 l5/0_repository/hooks/pre-rebase.sample create mode 100755 l5/0_repository/hooks/pre-receive.sample create mode 100755 l5/0_repository/hooks/prepare-commit-msg.sample create mode 100755 l5/0_repository/hooks/update.sample create mode 100644 l5/0_repository/index create mode 100644 l5/0_repository/info/exclude create mode 100644 l5/0_repository/logs/HEAD create mode 100644 l5/0_repository/logs/refs/heads/master create mode 100644 l5/0_repository/objects/3d/d7b2f2e093df4e7c06e3d8941780cf953f48ed create mode 100644 l5/0_repository/objects/74/9b47e753ea5c6f7ec8bfb6734f30c1707f13bc create mode 100644 l5/0_repository/objects/a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 create mode 100644 l5/0_repository/objects/b8/d5084ee89c38e789e9b052ac3eac3c42b9b302 create mode 100644 l5/0_repository/objects/b9/2b78fc1ac6bb6e90a1bc74344faaab18008799 create mode 100644 l5/0_repository/objects/c5/ecb9b43b7faf3d211c6959fae18fcb6b87d1cc create mode 100644 l5/0_repository/objects/c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 create mode 100644 l5/0_repository/objects/e7/0e00704aae84401a4301f50b755c5f2b22059a create mode 100644 l5/0_repository/objects/e9/16b8c6be7c02ddfcf66837c2b3ade94151b8d5 create mode 100644 l5/0_repository/objects/ed/59e80b5e63131df2c0c7e89a1893b0d349107d create mode 100644 l5/0_repository/objects/fe/036d759ff6f26e3b860abcc86f677f83bcb7bf create mode 100644 l5/0_repository/refs/heads/master create mode 100644 l5/1_overlay/README create mode 100644 l5/1_overlay/_Instructions.txt create mode 100644 l5/1_overlay/myScript.sh create mode 100644 l5/1_overlay/test/testing.txt create mode 100755 l5/3_workprep.sh create mode 100755 l5/5_solution.sh diff --git a/B_Compare.sh b/B_Compare.sh index fd71bca..c2fb6c2 100755 --- a/B_Compare.sh +++ b/B_Compare.sh @@ -28,29 +28,39 @@ echo -n "STATUS - " if [[ $(cmp -s "${tmpDir}/goalStatus.txt" "${tmpDir}/workStatus.txt";echo $?) == 0 ]] then echo "OK" else echo "FAIL" + diff -y --color=always *Status.txt + echo fi -echo -n "INDEX-FILES - " +echo -n "INDEX/WORKDIR-FILES - " if [[ $(cmp -s "${tmpDir}/goalStageFiles.txt" "${tmpDir}/workStageFiles.txt";echo $?) == 0 ]] then echo "OK" else echo "FAIL" + diff -y --color=always *StageFiles.txt + echo fi -echo -n "PUSH-STATE - " +echo -n "PUSH/COMMMIT-STATE - " if [[ $(cmp -s "${tmpDir}/goalPushState.txt" "${tmpDir}/workPushState.txt";echo $?) == 0 ]] then echo "OK" else echo "FAIL" + diff -y --color=always *PushState.txt + echo fi echo -n "BRANCH-SETUP - " if [[ $(cmp -s "${tmpDir}/goalBranchSetup.txt" "${tmpDir}/workBranchSetup.txt";echo $?) == 0 ]] then echo "OK" else echo "FAIL" + diff -y --color=always *BranchSetup.txt + echo fi echo -n "REMOTES - " if [[ $(cmp -s "${tmpDir}/goalRemotes.txt" "${tmpDir}/workRemotes.txt";echo $?) == 0 ]] then echo "OK" else echo "FAIL" + diff -y --color=always *Remotes.txt + echo fi diff --git a/l4/0_repository/.gitignore b/l4/0_repository/.gitignore new file mode 100644 index 0000000..b92b78f --- /dev/null +++ b/l4/0_repository/.gitignore @@ -0,0 +1 @@ +_Instructions.txt diff --git a/l4/0_repository/COMMIT_EDITMSG b/l4/0_repository/COMMIT_EDITMSG new file mode 100644 index 0000000..3b3fb90 --- /dev/null +++ b/l4/0_repository/COMMIT_EDITMSG @@ -0,0 +1 @@ +initial checkin. diff --git a/l4/0_repository/HEAD b/l4/0_repository/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/l4/0_repository/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/l4/0_repository/config b/l4/0_repository/config new file mode 100644 index 0000000..a4ef456 --- /dev/null +++ b/l4/0_repository/config @@ -0,0 +1,5 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + logallrefupdates = true diff --git a/l4/0_repository/description b/l4/0_repository/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/l4/0_repository/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/l4/0_repository/hooks/applypatch-msg.sample b/l4/0_repository/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/commit-msg.sample b/l4/0_repository/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/fsmonitor-watchman.sample b/l4/0_repository/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..ef94fa2 --- /dev/null +++ b/l4/0_repository/hooks/fsmonitor-watchman.sample @@ -0,0 +1,109 @@ +#!/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 + # subtract one second to make sure watchman will return all changes + $time = int ($time / 1000000000) - 1; +} 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. + + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $time, + "fields": ["name"] + }] + 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/l4/0_repository/hooks/post-update.sample b/l4/0_repository/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/pre-applypatch.sample b/l4/0_repository/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/pre-commit.sample b/l4/0_repository/hooks/pre-commit.sample new file mode 100755 index 0000000..6a75641 --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/pre-merge-commit.sample b/l4/0_repository/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/l4/0_repository/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/l4/0_repository/hooks/pre-push.sample b/l4/0_repository/hooks/pre-push.sample new file mode 100755 index 0000000..6187dbf --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/pre-rebase.sample b/l4/0_repository/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/pre-receive.sample b/l4/0_repository/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/prepare-commit-msg.sample b/l4/0_repository/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/hooks/update.sample b/l4/0_repository/hooks/update.sample new file mode 100755 index 0000000..80ba941 --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/index b/l4/0_repository/index new file mode 100644 index 0000000000000000000000000000000000000000..4d835692edda20608240688aca29ed0ca657001b GIT binary patch literal 145 zcmZ?q402{*U|<4b#`wTh`xSpSHNa>F1`YuR2DYsX42??|7?@u`FoV!e?TSBA$9CsU zSh%Oe#DCRl35NEW3|xBYnI)O&dHF@DK(oLgB*@hj$dF_(R50Lr8~K7eE?HRi(}CkJ iW=TxmaM@F!R@q~LUTW~Cj5!V;nsnZKNqGNUqzeFtTrg+= literal 0 HcmV?d00001 diff --git a/l4/0_repository/info/exclude b/l4/0_repository/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/l4/0_repository/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/l4/0_repository/logs/HEAD b/l4/0_repository/logs/HEAD new file mode 100644 index 0000000..4803551 --- /dev/null +++ b/l4/0_repository/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 c7c295f4c6fe6d973f14b1f8555e7932d1ecc053 Joe Tretter 1599187781 -0500 commit (initial): initial checkin. +c7c295f4c6fe6d973f14b1f8555e7932d1ecc053 a22e8ff622b2ee70b182775a808f12ed5bd979f0 Joe Tretter 1599192907 -0500 push +a22e8ff622b2ee70b182775a808f12ed5bd979f0 fe036d759ff6f26e3b860abcc86f677f83bcb7bf Joe Tretter 1599236291 -0500 push +fe036d759ff6f26e3b860abcc86f677f83bcb7bf e916b8c6be7c02ddfcf66837c2b3ade94151b8d5 Joe Tretter 1599237070 -0500 push diff --git a/l4/0_repository/logs/refs/heads/master b/l4/0_repository/logs/refs/heads/master new file mode 100644 index 0000000..4803551 --- /dev/null +++ b/l4/0_repository/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 c7c295f4c6fe6d973f14b1f8555e7932d1ecc053 Joe Tretter 1599187781 -0500 commit (initial): initial checkin. +c7c295f4c6fe6d973f14b1f8555e7932d1ecc053 a22e8ff622b2ee70b182775a808f12ed5bd979f0 Joe Tretter 1599192907 -0500 push +a22e8ff622b2ee70b182775a808f12ed5bd979f0 fe036d759ff6f26e3b860abcc86f677f83bcb7bf Joe Tretter 1599236291 -0500 push +fe036d759ff6f26e3b860abcc86f677f83bcb7bf e916b8c6be7c02ddfcf66837c2b3ade94151b8d5 Joe Tretter 1599237070 -0500 push diff --git a/l4/0_repository/objects/3d/d7b2f2e093df4e7c06e3d8941780cf953f48ed b/l4/0_repository/objects/3d/d7b2f2e093df4e7c06e3d8941780cf953f48ed new file mode 100644 index 0000000000000000000000000000000000000000..f05389099d116462d22e39074a3403249bd9b233 GIT binary patch literal 47 zcmV+~0MP$<0ZYosPf{>8WQh07D=sN2O)kmI&nwm|sVL#nD@rZMFU~BAXD~D{Ff%bx&`ZxO$xP47FG^*wy}s$wgUR>(YStX-t?DmUi0DZzFRpF literal 0 HcmV?d00001 diff --git a/l4/0_repository/objects/a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 b/l4/0_repository/objects/a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 new file mode 100644 index 0000000..aad33a8 --- /dev/null +++ b/l4/0_repository/objects/a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 @@ -0,0 +1,2 @@ +xM +0F]s4 vD+Ɣo{wߋxMģ zt2;E O)j&G(8eR6k<`M#UVMz׸x}^cBa@BT'┠V\I"HM \ No newline at end of file diff --git a/l4/0_repository/objects/b8/d5084ee89c38e789e9b052ac3eac3c42b9b302 b/l4/0_repository/objects/b8/d5084ee89c38e789e9b052ac3eac3c42b9b302 new file mode 100644 index 0000000000000000000000000000000000000000..2a2cd5ca189eacf93d9da1d92edd9bbd5c280474 GIT binary patch literal 94 zcmV-k0HObQ0V^p=O;s>AXD~D{Ff%bx&`ZxO$xP47FG^*wy}s$wgUR>(YStX-t?DmUi0DdbZSwj#n A=Kufz literal 0 HcmV?d00001 diff --git a/l4/0_repository/objects/b9/2b78fc1ac6bb6e90a1bc74344faaab18008799 b/l4/0_repository/objects/b9/2b78fc1ac6bb6e90a1bc74344faaab18008799 new file mode 100644 index 0000000000000000000000000000000000000000..6f455068446c24c184403c7b356742a3c4a5ad94 GIT binary patch literal 34 qcmbL6GKHVrzrph1r8Pf literal 0 HcmV?d00001 diff --git a/l4/0_repository/objects/c5/ecb9b43b7faf3d211c6959fae18fcb6b87d1cc b/l4/0_repository/objects/c5/ecb9b43b7faf3d211c6959fae18fcb6b87d1cc new file mode 100644 index 0000000000000000000000000000000000000000..e7e7c000c7b19ee631056648bdb6d8772df79cb5 GIT binary patch literal 69 zcmV-L0J{Hp0ZYosPf{>7W>8ktPs+^GPf9G#;7U!-$X8JENX^N~S18Xf%1KdFQm9cV bNljJIO;kv&NKN+1PuELHEa3tGK&}%DZz>-6 literal 0 HcmV?d00001 diff --git a/l4/0_repository/objects/c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 b/l4/0_repository/objects/c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 new file mode 100644 index 0000000..9abe02b --- /dev/null +++ b/l4/0_repository/objects/c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 @@ -0,0 +1 @@ +xA E]sdFD ik^hGKI_zw/?yZt o1glbP~&>D̘9/2< ;^%ʪS-W y<-HM#V?; \ No newline at end of file diff --git a/l4/0_repository/objects/e7/0e00704aae84401a4301f50b755c5f2b22059a b/l4/0_repository/objects/e7/0e00704aae84401a4301f50b755c5f2b22059a new file mode 100644 index 0000000000000000000000000000000000000000..8f6b1bb4d972c6ea204d98bfcdc505fc8f60c353 GIT binary patch literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx&`ZxO$xP47FG^*wy}s$wgUR>(YS=E=yR>1+5jgha1qrM zYKXBWCn`~@DbI0UI~`ZhcgGm$^l{nE&v*U$X=S1;-Ur&UXEt-4if`Z_ YuxaHAdT3wngYberN0A%MAL7+a-`ki@`v3p{ literal 0 HcmV?d00001 diff --git a/l4/0_repository/objects/ed/59e80b5e63131df2c0c7e89a1893b0d349107d b/l4/0_repository/objects/ed/59e80b5e63131df2c0c7e89a1893b0d349107d new file mode 100644 index 0000000000000000000000000000000000000000..c8c8995a1b8be7bf0708d186a92c0d68f9879c12 GIT binary patch literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx&`ZxO$xP47FG^+Dsa^3$>e%kQ2@Cg>nE0<+ NEy2(}698p;5mR#V7$^V$ literal 0 HcmV?d00001 diff --git a/l4/0_repository/objects/fe/036d759ff6f26e3b860abcc86f677f83bcb7bf b/l4/0_repository/objects/fe/036d759ff6f26e3b860abcc86f677f83bcb7bf new file mode 100644 index 0000000..5646cc0 --- /dev/null +++ b/l4/0_repository/objects/fe/036d759ff6f26e3b860abcc86f677f83bcb7bf @@ -0,0 +1 @@ +xK!]shc\|#2A3WpWyIUj.0:3LLFs0b\L$ckٕb#2! Nٓ/Rxp<w8=s˽5VϠ-:Giۺ%9sO:{H7 \ No newline at end of file diff --git a/l4/0_repository/refs/heads/master b/l4/0_repository/refs/heads/master new file mode 100644 index 0000000..4a65b5a --- /dev/null +++ b/l4/0_repository/refs/heads/master @@ -0,0 +1 @@ +e916b8c6be7c02ddfcf66837c2b3ade94151b8d5 diff --git a/l4/1_overlay/README b/l4/1_overlay/README new file mode 100644 index 0000000..e24bb2a --- /dev/null +++ b/l4/1_overlay/README @@ -0,0 +1 @@ +I want to be part of the INDEX diff --git a/l4/1_overlay/_Instructions.txt b/l4/1_overlay/_Instructions.txt new file mode 100644 index 0000000..b7f0b72 --- /dev/null +++ b/l4/1_overlay/_Instructions.txt @@ -0,0 +1,2 @@ +1) you played around a bit with the code and nothing works anymore. Now you want to go back to exaclty how the code is on the last commit. +- Make sure you also get git to remove any unversioned files. diff --git a/l4/1_overlay/myScript.sh b/l4/1_overlay/myScript.sh new file mode 100644 index 0000000..df9fa15 --- /dev/null +++ b/l4/1_overlay/myScript.sh @@ -0,0 +1,2 @@ +#!/bin/bash +echo"Hello world!" < tee -a execLog.dat diff --git a/l4/1_overlay/test/testing.txt b/l4/1_overlay/test/testing.txt new file mode 100644 index 0000000..b498fd4 --- /dev/null +++ b/l4/1_overlay/test/testing.txt @@ -0,0 +1 @@ +/ diff --git a/l4/3_workprep.sh b/l4/3_workprep.sh new file mode 100755 index 0000000..907c54e --- /dev/null +++ b/l4/3_workprep.sh @@ -0,0 +1,3 @@ +#!/bin/bash +git add README +git commit -m "X" diff --git a/l4/5_solution.sh b/l4/5_solution.sh new file mode 100755 index 0000000..1f5cbb2 --- /dev/null +++ b/l4/5_solution.sh @@ -0,0 +1,3 @@ +#!/bin/bash +git checkout . +git clean -f -d diff --git a/l5/0_repository/.gitignore b/l5/0_repository/.gitignore new file mode 100644 index 0000000..b92b78f --- /dev/null +++ b/l5/0_repository/.gitignore @@ -0,0 +1 @@ +_Instructions.txt diff --git a/l5/0_repository/COMMIT_EDITMSG b/l5/0_repository/COMMIT_EDITMSG new file mode 100644 index 0000000..3b3fb90 --- /dev/null +++ b/l5/0_repository/COMMIT_EDITMSG @@ -0,0 +1 @@ +initial checkin. diff --git a/l5/0_repository/HEAD b/l5/0_repository/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/l5/0_repository/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/l5/0_repository/config b/l5/0_repository/config new file mode 100644 index 0000000..a4ef456 --- /dev/null +++ b/l5/0_repository/config @@ -0,0 +1,5 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true + logallrefupdates = true diff --git a/l5/0_repository/description b/l5/0_repository/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/l5/0_repository/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/l5/0_repository/hooks/applypatch-msg.sample b/l5/0_repository/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/commit-msg.sample b/l5/0_repository/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/fsmonitor-watchman.sample b/l5/0_repository/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..ef94fa2 --- /dev/null +++ b/l5/0_repository/hooks/fsmonitor-watchman.sample @@ -0,0 +1,109 @@ +#!/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 + # subtract one second to make sure watchman will return all changes + $time = int ($time / 1000000000) - 1; +} 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. + + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $time, + "fields": ["name"] + }] + 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/l5/0_repository/hooks/post-update.sample b/l5/0_repository/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/pre-applypatch.sample b/l5/0_repository/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/pre-commit.sample b/l5/0_repository/hooks/pre-commit.sample new file mode 100755 index 0000000..6a75641 --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/pre-merge-commit.sample b/l5/0_repository/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/l5/0_repository/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/l5/0_repository/hooks/pre-push.sample b/l5/0_repository/hooks/pre-push.sample new file mode 100755 index 0000000..6187dbf --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/pre-rebase.sample b/l5/0_repository/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/pre-receive.sample b/l5/0_repository/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/prepare-commit-msg.sample b/l5/0_repository/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/hooks/update.sample b/l5/0_repository/hooks/update.sample new file mode 100755 index 0000000..80ba941 --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/index b/l5/0_repository/index new file mode 100644 index 0000000000000000000000000000000000000000..4d835692edda20608240688aca29ed0ca657001b GIT binary patch literal 145 zcmZ?q402{*U|<4b#`wTh`xSpSHNa>F1`YuR2DYsX42??|7?@u`FoV!e?TSBA$9CsU zSh%Oe#DCRl35NEW3|xBYnI)O&dHF@DK(oLgB*@hj$dF_(R50Lr8~K7eE?HRi(}CkJ iW=TxmaM@F!R@q~LUTW~Cj5!V;nsnZKNqGNUqzeFtTrg+= literal 0 HcmV?d00001 diff --git a/l5/0_repository/info/exclude b/l5/0_repository/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/l5/0_repository/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/l5/0_repository/logs/HEAD b/l5/0_repository/logs/HEAD new file mode 100644 index 0000000..4803551 --- /dev/null +++ b/l5/0_repository/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 c7c295f4c6fe6d973f14b1f8555e7932d1ecc053 Joe Tretter 1599187781 -0500 commit (initial): initial checkin. +c7c295f4c6fe6d973f14b1f8555e7932d1ecc053 a22e8ff622b2ee70b182775a808f12ed5bd979f0 Joe Tretter 1599192907 -0500 push +a22e8ff622b2ee70b182775a808f12ed5bd979f0 fe036d759ff6f26e3b860abcc86f677f83bcb7bf Joe Tretter 1599236291 -0500 push +fe036d759ff6f26e3b860abcc86f677f83bcb7bf e916b8c6be7c02ddfcf66837c2b3ade94151b8d5 Joe Tretter 1599237070 -0500 push diff --git a/l5/0_repository/logs/refs/heads/master b/l5/0_repository/logs/refs/heads/master new file mode 100644 index 0000000..4803551 --- /dev/null +++ b/l5/0_repository/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 c7c295f4c6fe6d973f14b1f8555e7932d1ecc053 Joe Tretter 1599187781 -0500 commit (initial): initial checkin. +c7c295f4c6fe6d973f14b1f8555e7932d1ecc053 a22e8ff622b2ee70b182775a808f12ed5bd979f0 Joe Tretter 1599192907 -0500 push +a22e8ff622b2ee70b182775a808f12ed5bd979f0 fe036d759ff6f26e3b860abcc86f677f83bcb7bf Joe Tretter 1599236291 -0500 push +fe036d759ff6f26e3b860abcc86f677f83bcb7bf e916b8c6be7c02ddfcf66837c2b3ade94151b8d5 Joe Tretter 1599237070 -0500 push diff --git a/l5/0_repository/objects/3d/d7b2f2e093df4e7c06e3d8941780cf953f48ed b/l5/0_repository/objects/3d/d7b2f2e093df4e7c06e3d8941780cf953f48ed new file mode 100644 index 0000000000000000000000000000000000000000..f05389099d116462d22e39074a3403249bd9b233 GIT binary patch literal 47 zcmV+~0MP$<0ZYosPf{>8WQh07D=sN2O)kmI&nwm|sVL#nD@rZMFU~BAXD~D{Ff%bx&`ZxO$xP47FG^*wy}s$wgUR>(YStX-t?DmUi0DZzFRpF literal 0 HcmV?d00001 diff --git a/l5/0_repository/objects/a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 b/l5/0_repository/objects/a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 new file mode 100644 index 0000000..aad33a8 --- /dev/null +++ b/l5/0_repository/objects/a2/2e8ff622b2ee70b182775a808f12ed5bd979f0 @@ -0,0 +1,2 @@ +xM +0F]s4 vD+Ɣo{wߋxMģ zt2;E O)j&G(8eR6k<`M#UVMz׸x}^cBa@BT'┠V\I"HM \ No newline at end of file diff --git a/l5/0_repository/objects/b8/d5084ee89c38e789e9b052ac3eac3c42b9b302 b/l5/0_repository/objects/b8/d5084ee89c38e789e9b052ac3eac3c42b9b302 new file mode 100644 index 0000000000000000000000000000000000000000..2a2cd5ca189eacf93d9da1d92edd9bbd5c280474 GIT binary patch literal 94 zcmV-k0HObQ0V^p=O;s>AXD~D{Ff%bx&`ZxO$xP47FG^*wy}s$wgUR>(YStX-t?DmUi0DdbZSwj#n A=Kufz literal 0 HcmV?d00001 diff --git a/l5/0_repository/objects/b9/2b78fc1ac6bb6e90a1bc74344faaab18008799 b/l5/0_repository/objects/b9/2b78fc1ac6bb6e90a1bc74344faaab18008799 new file mode 100644 index 0000000000000000000000000000000000000000..6f455068446c24c184403c7b356742a3c4a5ad94 GIT binary patch literal 34 qcmbL6GKHVrzrph1r8Pf literal 0 HcmV?d00001 diff --git a/l5/0_repository/objects/c5/ecb9b43b7faf3d211c6959fae18fcb6b87d1cc b/l5/0_repository/objects/c5/ecb9b43b7faf3d211c6959fae18fcb6b87d1cc new file mode 100644 index 0000000000000000000000000000000000000000..e7e7c000c7b19ee631056648bdb6d8772df79cb5 GIT binary patch literal 69 zcmV-L0J{Hp0ZYosPf{>7W>8ktPs+^GPf9G#;7U!-$X8JENX^N~S18Xf%1KdFQm9cV bNljJIO;kv&NKN+1PuELHEa3tGK&}%DZz>-6 literal 0 HcmV?d00001 diff --git a/l5/0_repository/objects/c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 b/l5/0_repository/objects/c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 new file mode 100644 index 0000000..9abe02b --- /dev/null +++ b/l5/0_repository/objects/c7/c295f4c6fe6d973f14b1f8555e7932d1ecc053 @@ -0,0 +1 @@ +xA E]sdFD ik^hGKI_zw/?yZt o1glbP~&>D̘9/2< ;^%ʪS-W y<-HM#V?; \ No newline at end of file diff --git a/l5/0_repository/objects/e7/0e00704aae84401a4301f50b755c5f2b22059a b/l5/0_repository/objects/e7/0e00704aae84401a4301f50b755c5f2b22059a new file mode 100644 index 0000000000000000000000000000000000000000..8f6b1bb4d972c6ea204d98bfcdc505fc8f60c353 GIT binary patch literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx&`ZxO$xP47FG^*wy}s$wgUR>(YS=E=yR>1+5jgha1qrM zYKXBWCn`~@DbI0UI~`ZhcgGm$^l{nE&v*U$X=S1;-Ur&UXEt-4if`Z_ YuxaHAdT3wngYberN0A%MAL7+a-`ki@`v3p{ literal 0 HcmV?d00001 diff --git a/l5/0_repository/objects/ed/59e80b5e63131df2c0c7e89a1893b0d349107d b/l5/0_repository/objects/ed/59e80b5e63131df2c0c7e89a1893b0d349107d new file mode 100644 index 0000000000000000000000000000000000000000..c8c8995a1b8be7bf0708d186a92c0d68f9879c12 GIT binary patch literal 55 zcmV-70LcG%0V^p=O;s?qU@$Z=Ff%bx&`ZxO$xP47FG^+Dsa^3$>e%kQ2@Cg>nE0<+ NEy2(}698p;5mR#V7$^V$ literal 0 HcmV?d00001 diff --git a/l5/0_repository/objects/fe/036d759ff6f26e3b860abcc86f677f83bcb7bf b/l5/0_repository/objects/fe/036d759ff6f26e3b860abcc86f677f83bcb7bf new file mode 100644 index 0000000..5646cc0 --- /dev/null +++ b/l5/0_repository/objects/fe/036d759ff6f26e3b860abcc86f677f83bcb7bf @@ -0,0 +1 @@ +xK!]shc\|#2A3WpWyIUj.0:3LLFs0b\L$ckٕb#2! Nٓ/Rxp<w8=s˽5VϠ-:Giۺ%9sO:{H7 \ No newline at end of file diff --git a/l5/0_repository/refs/heads/master b/l5/0_repository/refs/heads/master new file mode 100644 index 0000000..4a65b5a --- /dev/null +++ b/l5/0_repository/refs/heads/master @@ -0,0 +1 @@ +e916b8c6be7c02ddfcf66837c2b3ade94151b8d5 diff --git a/l5/1_overlay/README b/l5/1_overlay/README new file mode 100644 index 0000000..e24bb2a --- /dev/null +++ b/l5/1_overlay/README @@ -0,0 +1 @@ +I want to be part of the INDEX diff --git a/l5/1_overlay/_Instructions.txt b/l5/1_overlay/_Instructions.txt new file mode 100644 index 0000000..31875db --- /dev/null +++ b/l5/1_overlay/_Instructions.txt @@ -0,0 +1 @@ +1) You find that all your local changes need to go, and you want to "clean" you local environment to be consistent witht he version of that branch that is on the remote server. diff --git a/l5/1_overlay/myScript.sh b/l5/1_overlay/myScript.sh new file mode 100644 index 0000000..df9fa15 --- /dev/null +++ b/l5/1_overlay/myScript.sh @@ -0,0 +1,2 @@ +#!/bin/bash +echo"Hello world!" < tee -a execLog.dat diff --git a/l5/1_overlay/test/testing.txt b/l5/1_overlay/test/testing.txt new file mode 100644 index 0000000..b498fd4 --- /dev/null +++ b/l5/1_overlay/test/testing.txt @@ -0,0 +1 @@ +/ diff --git a/l5/3_workprep.sh b/l5/3_workprep.sh new file mode 100755 index 0000000..907c54e --- /dev/null +++ b/l5/3_workprep.sh @@ -0,0 +1,3 @@ +#!/bin/bash +git add README +git commit -m "X" diff --git a/l5/5_solution.sh b/l5/5_solution.sh new file mode 100755 index 0000000..1f60bac --- /dev/null +++ b/l5/5_solution.sh @@ -0,0 +1,3 @@ +#!/bin/bash +git reset --hard origin/master +git clean -f -d