From ef585ae148a153397c7359f19f3870d7205fb99d Mon Sep 17 00:00:00 2001 From: Gary Rennie Date: Mon, 9 Dec 2013 20:09:48 +0000 Subject: [PATCH] Merge smilansky/master with --squashed option Squashed commit of the following: commit d1bca787f50f8013a36002fe7b49634c14255d46 Author: Daniel Smilansky Date: Wed Dec 4 22:40:54 2013 -0800 delete branch commit 65d628db8908c460da2f3393ab10953467d6d4e9 Author: Daniel Smilansky Date: Wed Dec 4 16:06:27 2013 -0800 change to .githug commit a30338c57c903cd9236d8e6805d2d8c55313c7e5 Author: Daniel Smilansky Date: Wed Dec 4 08:44:56 2013 -0800 spec added commit 6242fa0c97bb73bd406449139c4ccff6129cb94f Author: Daniel Smilansky Date: Wed Dec 4 08:42:06 2013 -0800 spec helper commit 48f406b9385523e0b060182baa9f84a751287612 Author: Daniel Smilansky Date: Wed Dec 4 00:05:19 2013 -0800 delete branch level final commit a463db7d2bdf53fa0cbc5f6018fcca57e9aa0714 Author: Daniel Smilansky Date: Tue Dec 3 23:25:19 2013 -0800 delete branch folder commit 7ca47ee1ba24ef0c7afad2ba1975fe4867d53ccb Author: Daniel Smilansky Date: Tue Dec 3 22:35:27 2013 -0800 delete branch level commit cc848e8d801b82bca2c784fd09133e1440ee62a0 Author: Daniel Smilansky Date: Tue Dec 3 21:22:59 2013 -0800 Initial commit commit 420106b7caf7c0bec90e9fd69e93def49d8ab36d Author: Daniel Smilansky Date: Tue Dec 3 21:22:47 2013 -0800 Initial commit commit 3a9b9caaa423da64420df7c94947275718063f07 Author: Daniel Smilansky Date: Tue Dec 3 21:22:27 2013 -0800 Initial commit commit 23accada246f4157ad2ce3929eb964079e91391d Author: Daniel Smilansky Date: Tue Dec 3 21:21:34 2013 -0800 Initial commit commit fc47fb38676168de3f5bf1ec7402cb037d11f598 Author: Daniel Smilansky Date: Tue Dec 3 21:19:44 2013 -0800 Initial commit commit dc3b4e3b60182e729cc4f7078c8f5437f2e45c4a Author: Daniel Smilansky Date: Tue Dec 3 21:19:15 2013 -0800 delete_branch level --- .gitignore | 2 +- levels/delete_branch.rb | 15 ++ levels/delete_branch/.githug/COMMIT_EDITMSG | 1 + levels/delete_branch/.githug/HEAD | 1 + levels/delete_branch/.githug/config | 7 + levels/delete_branch/.githug/description | 1 + .../.githug/hooks/applypatch-msg.sample | 15 ++ .../.githug/hooks/commit-msg.sample | 24 +++ .../.githug/hooks/post-update.sample | 8 + .../.githug/hooks/pre-applypatch.sample | 14 ++ .../.githug/hooks/pre-commit.sample | 49 +++++ .../.githug/hooks/pre-push.sample | 53 ++++++ .../.githug/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../.githug/hooks/prepare-commit-msg.sample | 36 ++++ .../delete_branch/.githug/hooks/update.sample | 128 +++++++++++++ levels/delete_branch/.githug/index | Bin 0 -> 104 bytes levels/delete_branch/.githug/info/exclude | 6 + levels/delete_branch/.githug/logs/HEAD | 4 + .../.githug/logs/refs/heads/delete_me | 1 + .../.githug/logs/refs/heads/master | 1 + .../b6/0afe294eb3c200d646995c9e0234470157c1b0 | 2 + .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 0 -> 15 bytes .../e8/0ad49ace82167de62e498622d70377d913c79e | Bin 0 -> 51 bytes .../.githug/refs/heads/delete_me | 1 + .../delete_branch/.githug/refs/heads/master | 1 + levels/delete_branch/readme | 0 lib/githug/level.rb | 2 +- spec/githug_spec.rb | 5 + 28 files changed, 544 insertions(+), 2 deletions(-) create mode 100644 levels/delete_branch.rb create mode 100644 levels/delete_branch/.githug/COMMIT_EDITMSG create mode 100644 levels/delete_branch/.githug/HEAD create mode 100644 levels/delete_branch/.githug/config create mode 100644 levels/delete_branch/.githug/description create mode 100755 levels/delete_branch/.githug/hooks/applypatch-msg.sample create mode 100755 levels/delete_branch/.githug/hooks/commit-msg.sample create mode 100755 levels/delete_branch/.githug/hooks/post-update.sample create mode 100755 levels/delete_branch/.githug/hooks/pre-applypatch.sample create mode 100755 levels/delete_branch/.githug/hooks/pre-commit.sample create mode 100755 levels/delete_branch/.githug/hooks/pre-push.sample create mode 100755 levels/delete_branch/.githug/hooks/pre-rebase.sample create mode 100755 levels/delete_branch/.githug/hooks/prepare-commit-msg.sample create mode 100755 levels/delete_branch/.githug/hooks/update.sample create mode 100644 levels/delete_branch/.githug/index create mode 100644 levels/delete_branch/.githug/info/exclude create mode 100644 levels/delete_branch/.githug/logs/HEAD create mode 100644 levels/delete_branch/.githug/logs/refs/heads/delete_me create mode 100644 levels/delete_branch/.githug/logs/refs/heads/master create mode 100644 levels/delete_branch/.githug/objects/b6/0afe294eb3c200d646995c9e0234470157c1b0 create mode 100644 levels/delete_branch/.githug/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 create mode 100644 levels/delete_branch/.githug/objects/e8/0ad49ace82167de62e498622d70377d913c79e create mode 100644 levels/delete_branch/.githug/refs/heads/delete_me create mode 100644 levels/delete_branch/.githug/refs/heads/master create mode 100644 levels/delete_branch/readme diff --git a/.gitignore b/.gitignore index c51e6466..cfb59a62 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ pkg/* *.swp .rvmrc git_hug/* -.profile.yml +.profile.yml \ No newline at end of file diff --git a/levels/delete_branch.rb b/levels/delete_branch.rb new file mode 100644 index 00000000..8f579adc --- /dev/null +++ b/levels/delete_branch.rb @@ -0,0 +1,15 @@ +difficulty 2 + +description "You have created too many branches for your project. There is an old branch in your repo called 'delete_me', you should delete it." + +setup do + init_from_level +end + +solution do + return true unless repo.branches.map(&:name).include?('delete_me') +end + +hint do + puts "Running 'git --help branch' will give you a list of branch commands." +end \ No newline at end of file diff --git a/levels/delete_branch/.githug/COMMIT_EDITMSG b/levels/delete_branch/.githug/COMMIT_EDITMSG new file mode 100644 index 00000000..9d605d43 --- /dev/null +++ b/levels/delete_branch/.githug/COMMIT_EDITMSG @@ -0,0 +1 @@ +delete_me branch diff --git a/levels/delete_branch/.githug/HEAD b/levels/delete_branch/.githug/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/levels/delete_branch/.githug/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/levels/delete_branch/.githug/config b/levels/delete_branch/.githug/config new file mode 100644 index 00000000..bb4d11c1 --- /dev/null +++ b/levels/delete_branch/.githug/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = false diff --git a/levels/delete_branch/.githug/description b/levels/delete_branch/.githug/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/levels/delete_branch/.githug/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/levels/delete_branch/.githug/hooks/applypatch-msg.sample b/levels/delete_branch/.githug/hooks/applypatch-msg.sample new file mode 100755 index 00000000..8b2a2fe8 --- /dev/null +++ b/levels/delete_branch/.githug/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 +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff --git a/levels/delete_branch/.githug/hooks/commit-msg.sample b/levels/delete_branch/.githug/hooks/commit-msg.sample new file mode 100755 index 00000000..b58d1184 --- /dev/null +++ b/levels/delete_branch/.githug/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/levels/delete_branch/.githug/hooks/post-update.sample b/levels/delete_branch/.githug/hooks/post-update.sample new file mode 100755 index 00000000..ec17ec19 --- /dev/null +++ b/levels/delete_branch/.githug/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/levels/delete_branch/.githug/hooks/pre-applypatch.sample b/levels/delete_branch/.githug/hooks/pre-applypatch.sample new file mode 100755 index 00000000..b1f187c2 --- /dev/null +++ b/levels/delete_branch/.githug/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 +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff --git a/levels/delete_branch/.githug/hooks/pre-commit.sample b/levels/delete_branch/.githug/hooks/pre-commit.sample new file mode 100755 index 00000000..586e3bf9 --- /dev/null +++ b/levels/delete_branch/.githug/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=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config 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/levels/delete_branch/.githug/hooks/pre-push.sample b/levels/delete_branch/.githug/hooks/pre-push.sample new file mode 100755 index 00000000..15ab6d8e --- /dev/null +++ b/levels/delete_branch/.githug/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 + +IFS=' ' +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 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/levels/delete_branch/.githug/hooks/pre-rebase.sample b/levels/delete_branch/.githug/hooks/pre-rebase.sample new file mode 100755 index 00000000..9773ed4c --- /dev/null +++ b/levels/delete_branch/.githug/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 + +exit 0 + +################################################################ + +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". diff --git a/levels/delete_branch/.githug/hooks/prepare-commit-msg.sample b/levels/delete_branch/.githug/hooks/prepare-commit-msg.sample new file mode 100755 index 00000000..f093a02e --- /dev/null +++ b/levels/delete_branch/.githug/hooks/prepare-commit-msg.sample @@ -0,0 +1,36 @@ +#!/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 comments out the +# "Conflicts:" part of a merge commit. +# +# 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. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff --git a/levels/delete_branch/.githug/hooks/update.sample b/levels/delete_branch/.githug/hooks/update.sample new file mode 100755 index 00000000..d8475837 --- /dev/null +++ b/levels/delete_branch/.githug/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks 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/levels/delete_branch/.githug/index b/levels/delete_branch/.githug/index new file mode 100644 index 0000000000000000000000000000000000000000..f845439d7e2b829997a7396a7bbe51c74a62955d GIT binary patch literal 104 zcmZ?q402{*U|<4b#-IiAlYle>jAmqDU}iX@uf@R7xCAKu6(}VFl7BY$(d 1386225561 -0800 commit (initial): first commit +b60afe294eb3c200d646995c9e0234470157c1b0 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky 1386225573 -0800 checkout: moving from master to master +b60afe294eb3c200d646995c9e0234470157c1b0 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky 1386225580 -0800 checkout: moving from master to delete_me +b60afe294eb3c200d646995c9e0234470157c1b0 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky 1386225584 -0800 checkout: moving from delete_me to master diff --git a/levels/delete_branch/.githug/logs/refs/heads/delete_me b/levels/delete_branch/.githug/logs/refs/heads/delete_me new file mode 100644 index 00000000..34c5a538 --- /dev/null +++ b/levels/delete_branch/.githug/logs/refs/heads/delete_me @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky 1386225568 -0800 branch: Created from master diff --git a/levels/delete_branch/.githug/logs/refs/heads/master b/levels/delete_branch/.githug/logs/refs/heads/master new file mode 100644 index 00000000..79bf0ffc --- /dev/null +++ b/levels/delete_branch/.githug/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 b60afe294eb3c200d646995c9e0234470157c1b0 Daniel Smilansky 1386225561 -0800 commit (initial): first commit diff --git a/levels/delete_branch/.githug/objects/b6/0afe294eb3c200d646995c9e0234470157c1b0 b/levels/delete_branch/.githug/objects/b6/0afe294eb3c200d646995c9e0234470157c1b0 new file mode 100644 index 00000000..10b044b4 --- /dev/null +++ b/levels/delete_branch/.githug/objects/b6/0afe294eb3c200d646995c9e0234470157c1b0 @@ -0,0 +1,2 @@ +x¥ÍÍ !†aÏT1 hØå'Ùv`•Kx°{×+ðöå=<_¨¥¤èq73°“'OBc#Å“wF©h¥¶6zÔÁzô÷ÚàLkâ —’2­ýñ‚%öß>Ý +¥|µõǘgƒ°—NJ±Õíxð„¸¦Ö|%ñû1?Q \ No newline at end of file diff --git a/levels/delete_branch/.githug/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/levels/delete_branch/.githug/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 new file mode 100644 index 0000000000000000000000000000000000000000..711223894375fe1186ac5bfffdc48fb1fa1e65cc GIT binary patch literal 15 Wcmb6=<%_Wj};U-9*p)#cgiwEK4zzVP(_;KJY- HFZdS#xDFG5 literal 0 HcmV?d00001 diff --git a/levels/delete_branch/.githug/refs/heads/delete_me b/levels/delete_branch/.githug/refs/heads/delete_me new file mode 100644 index 00000000..95daea8f --- /dev/null +++ b/levels/delete_branch/.githug/refs/heads/delete_me @@ -0,0 +1 @@ +b60afe294eb3c200d646995c9e0234470157c1b0 diff --git a/levels/delete_branch/.githug/refs/heads/master b/levels/delete_branch/.githug/refs/heads/master new file mode 100644 index 00000000..95daea8f --- /dev/null +++ b/levels/delete_branch/.githug/refs/heads/master @@ -0,0 +1 @@ +b60afe294eb3c200d646995c9e0234470157c1b0 diff --git a/levels/delete_branch/readme b/levels/delete_branch/readme new file mode 100644 index 00000000..e69de29b diff --git a/lib/githug/level.rb b/lib/githug/level.rb index 5c4a15af..7b68d425 100644 --- a/lib/githug/level.rb +++ b/lib/githug/level.rb @@ -7,7 +7,7 @@ class Level "stash", "rename", "log", "tag", "push_tags", "commit_amend", "commit_in_future", "reset", "reset_soft", "checkout_file", "remote", "remote_url", "pull", "remote_add", "push", "diff", "blame", "branch", - "checkout", "checkout_tag", "checkout_tag_over_branch", "branch_at", + "checkout", "checkout_tag", "checkout_tag_over_branch", "branch_at", "delete_branch", "merge", "repack", "cherry-pick", "grep", "rename_commit", "squash", "merge_squash", "reorder", "bisect", "stage_lines", "find_old_branch", "revert", "restore", "conflict", "contribute"] diff --git a/spec/githug_spec.rb b/spec/githug_spec.rb index fdb6460d..92a94814 100644 --- a/spec/githug_spec.rb +++ b/spec/githug_spec.rb @@ -195,6 +195,11 @@ def skip_level `githug`.should be_solved end + it "should complete the delete_branch level" do + `git branch -d delete_me` + `githug`.should be_solved + end + it "should commit the merge level" do `git merge feature` `githug`.should be_solved