diff --git a/command/command_test.go b/command/command_test.go index 01863ee39..2104d33a9 100644 --- a/command/command_test.go +++ b/command/command_test.go @@ -256,6 +256,42 @@ func testTempDir(t *testing.T) string { return d } +// testRename renames the path to new and returns a function to defer to +// revert the rename. +func testRename(t *testing.T, base, path, new string) func() { + if base != "" { + path = filepath.Join(base, path) + new = filepath.Join(base, new) + } + + if err := os.Rename(path, new); err != nil { + t.Fatalf("err: %s", err) + } + + return func() { + // Just re-rename and ignore the return value + testRename(t, "", new, path) + } +} + +// testChdir changes the directory and returns a function to defer to +// revert the old cwd. +func testChdir(t *testing.T, new string) func() { + old, err := os.Getwd() + if err != nil { + t.Fatalf("err: %s", err) + } + + if err := os.Chdir(new); err != nil { + t.Fatalf("err: %v", err) + } + + return func() { + // Re-run the function ignoring the defer result + testChdir(t, old) + } +} + // testCwd is used to change the current working directory // into a test directory that should be remoted after func testCwd(t *testing.T) (string, string) { diff --git a/command/push.go b/command/push.go index d9dda82b7..981b8c6d7 100644 --- a/command/push.go +++ b/command/push.go @@ -206,6 +206,8 @@ func (c *PushCommand) Run(args []string) int { filepath.Join(c.DataDir(), "modules")) } + println(fmt.Sprintf("%#v", archiveOpts)) + archiveR, err := archive.CreateArchive(configPath, archiveOpts) if err != nil { c.Ui.Error(fmt.Sprintf( @@ -214,6 +216,16 @@ func (c *PushCommand) Run(args []string) int { return 1 } + /* + f, err := os.Create("ARCHIVE.tar.gz") + if err != nil { + panic(err) + } + io.Copy(f, archiveR) + f.Close() + return 12 + */ + // List of the vars we're uploading to display to the user. // We always upload all vars from atlas, but only report them if they are overwritten. var setVars []string diff --git a/command/push_test.go b/command/push_test.go index 2f78dd6fa..4697dfa4d 100644 --- a/command/push_test.go +++ b/command/push_test.go @@ -72,6 +72,62 @@ func TestPush_good(t *testing.T) { } } +func TestPush_noUploadModules(t *testing.T) { + // Path where the archive will be "uploaded" to + archivePath := testTempFile(t) + defer os.Remove(archivePath) + + client := &mockPushClient{File: archivePath} + ui := new(cli.MockUi) + c := &PushCommand{ + Meta: Meta{ + ContextOpts: testCtxConfig(testProvider()), + Ui: ui, + }, + + client: client, + } + + // Path of the test. We have to do some renaming to avoid our own + // VCS getting in the way. + path := testFixturePath("push-no-upload-2") + defer testRename(t, path, "DOTterraform", ".terraform")() + defer testRename(t, path, "DOTgit", ".git")() + + // Move into that directory + defer testChdir(t, path)() + + // Create remote state file, this should be pulled + conf, srv := testRemoteState(t, testState(), 200) + defer srv.Close() + + // Persist local remote state + s := terraform.NewState() + s.Serial = 5 + s.Remote = conf + testStateFileRemote(t, s) + + args := []string{ + "-name=mitchellh/tf-test", + "-upload-modules=false", + path, + } + if code := c.Run(args); code != 0 { + t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) + } + + actual := testArchiveStr(t, archivePath) + expected := []string{ + ".gitignore", + ".terraform/", + ".terraform/terraform.tfstate", + "main.tf", + } + if !reflect.DeepEqual(actual, expected) { + t.Fatalf("bad: %#v", actual) + } +} + func TestPush_input(t *testing.T) { tmp, cwd := testCwd(t) defer testFixCwd(t, tmp, cwd) diff --git a/command/test-fixtures/push-no-upload-2/.gitignore b/command/test-fixtures/push-no-upload-2/.gitignore new file mode 100644 index 000000000..1c99dc138 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/.gitignore @@ -0,0 +1 @@ +.terraform/ diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/COMMIT_EDITMSG b/command/test-fixtures/push-no-upload-2/DOTgit/COMMIT_EDITMSG new file mode 100644 index 000000000..4fbdfdf3e --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/COMMIT_EDITMSG @@ -0,0 +1,11 @@ +Stuff +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch master +# +# Initial commit +# +# Changes to be committed: +# new file: .gitignore +# new file: main.tf +# diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/HEAD b/command/test-fixtures/push-no-upload-2/DOTgit/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/config b/command/test-fixtures/push-no-upload-2/DOTgit/config new file mode 100644 index 000000000..6c9406b7d --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/description b/command/test-fixtures/push-no-upload-2/DOTgit/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/applypatch-msg.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/applypatch-msg.sample new file mode 100755 index 000000000..a5d7b84a6 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/hooks/commit-msg.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/commit-msg.sample new file mode 100755 index 000000000..b58d1184a --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/hooks/post-update.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/post-update.sample new file mode 100755 index 000000000..ec17ec193 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-applypatch.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-applypatch.sample new file mode 100755 index 000000000..4142082bc --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-commit.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-commit.sample new file mode 100755 index 000000000..68d62d544 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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 --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/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-push.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-push.sample new file mode 100755 index 000000000..6187dbf43 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-rebase.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-rebase.sample new file mode 100755 index 000000000..9773ed4cb --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/hooks/prepare-commit-msg.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/prepare-commit-msg.sample new file mode 100755 index 000000000..f093a02ec --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/hooks/update.sample b/command/test-fixtures/push-no-upload-2/DOTgit/hooks/update.sample new file mode 100755 index 000000000..80ba94135 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/index b/command/test-fixtures/push-no-upload-2/DOTgit/index new file mode 100644 index 000000000..f35cf6f9e Binary files /dev/null and b/command/test-fixtures/push-no-upload-2/DOTgit/index differ diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/info/exclude b/command/test-fixtures/push-no-upload-2/DOTgit/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/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/command/test-fixtures/push-no-upload-2/DOTgit/logs/HEAD b/command/test-fixtures/push-no-upload-2/DOTgit/logs/HEAD new file mode 100644 index 000000000..fd338eebc --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 1f4379fc58839e6cdfd193d8a5333fee1f33d522 Mitchell Hashimoto 1472015900 -0700 commit (initial): Stuff diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/logs/refs/heads/master b/command/test-fixtures/push-no-upload-2/DOTgit/logs/refs/heads/master new file mode 100644 index 000000000..fd338eebc --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 1f4379fc58839e6cdfd193d8a5333fee1f33d522 Mitchell Hashimoto 1472015900 -0700 commit (initial): Stuff diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/objects/1c/99dc138aa275b2577bc6d9d2c7b185aeeb27ad b/command/test-fixtures/push-no-upload-2/DOTgit/objects/1c/99dc138aa275b2577bc6d9d2c7b185aeeb27ad new file mode 100644 index 000000000..3c6ac46c7 Binary files /dev/null and b/command/test-fixtures/push-no-upload-2/DOTgit/objects/1c/99dc138aa275b2577bc6d9d2c7b185aeeb27ad differ diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/objects/1f/4379fc58839e6cdfd193d8a5333fee1f33d522 b/command/test-fixtures/push-no-upload-2/DOTgit/objects/1f/4379fc58839e6cdfd193d8a5333fee1f33d522 new file mode 100644 index 000000000..31fd3d9fa --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/objects/1f/4379fc58839e6cdfd193d8a5333fee1f33d522 @@ -0,0 +1,5 @@ +x9ӣFE+:f\cA EPҢH-k2᩺'yi@@P8I†G|n/H`* +!*FLVcQ]3}!#?>Ɵ;*@^X(lY|c%>"+Y?Qu82jt<椑ftc&9i 3_&+ŶC +W:X7NoZF3y֒:D^"3>*X\BӓHUL._khL_1/D=]"׃ah.ۚ]F"KX1m&]2-Aeq7e g(G#˞=.}yNj۶VvXu|a_RHy]zV"TEx5.gOcFaWexoZ֤- >9S`G\P.#wQW2 Կ3=FBEtQurQ \ No newline at end of file diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/objects/ac/cd15f3424d1d4b83da634f608d89736b20c6a0 b/command/test-fixtures/push-no-upload-2/DOTgit/objects/ac/cd15f3424d1d4b83da634f608d89736b20c6a0 new file mode 100644 index 000000000..e47843fa9 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/objects/ac/cd15f3424d1d4b83da634f608d89736b20c6a0 @@ -0,0 +1,3 @@ +xm +0EW C5 H?8@ґ8)uyc%rҧS E̜%hG/MDѺ Me9: +inBhmG5{YjU*щWh.I~)ͻ``޼ή+ur) ]{Oy|`NM \ No newline at end of file diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/objects/d9/1d31d1722127534e4aef247ae651a75122d1be b/command/test-fixtures/push-no-upload-2/DOTgit/objects/d9/1d31d1722127534e4aef247ae651a75122d1be new file mode 100644 index 000000000..ea1e36fea Binary files /dev/null and b/command/test-fixtures/push-no-upload-2/DOTgit/objects/d9/1d31d1722127534e4aef247ae651a75122d1be differ diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/refs/heads/master b/command/test-fixtures/push-no-upload-2/DOTgit/refs/heads/master new file mode 100644 index 000000000..a7c92e142 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTgit/refs/heads/master @@ -0,0 +1 @@ +1f4379fc58839e6cdfd193d8a5333fee1f33d522 diff --git a/command/test-fixtures/push-no-upload-2/DOTterraform/modules/0aec430d87a09fa44453780d5bb00156/main.tf b/command/test-fixtures/push-no-upload-2/DOTterraform/modules/0aec430d87a09fa44453780d5bb00156/main.tf new file mode 100644 index 000000000..fec56017d --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/DOTterraform/modules/0aec430d87a09fa44453780d5bb00156/main.tf @@ -0,0 +1 @@ +# Hello diff --git a/command/test-fixtures/push-no-upload-2/child/main.tf b/command/test-fixtures/push-no-upload-2/child/main.tf new file mode 100644 index 000000000..b7db25411 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/child/main.tf @@ -0,0 +1 @@ +# Empty diff --git a/command/test-fixtures/push-no-upload-2/main.tf b/command/test-fixtures/push-no-upload-2/main.tf new file mode 100644 index 000000000..c70c8b611 --- /dev/null +++ b/command/test-fixtures/push-no-upload-2/main.tf @@ -0,0 +1 @@ +module "example" { source = "./child" } diff --git a/command/test-fixtures/push-no-upload/.gitignore b/command/test-fixtures/push-no-upload/.gitignore new file mode 100644 index 000000000..3fa8c86b7 --- /dev/null +++ b/command/test-fixtures/push-no-upload/.gitignore @@ -0,0 +1 @@ +.terraform diff --git a/command/test-fixtures/push-no-upload/DOTgit/COMMIT_EDITMSG b/command/test-fixtures/push-no-upload/DOTgit/COMMIT_EDITMSG new file mode 100644 index 000000000..3c1abcfc9 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/COMMIT_EDITMSG @@ -0,0 +1,11 @@ +Commit +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# On branch master +# +# Initial commit +# +# Changes to be committed: +# new file: .gitignore +# new file: main.tf +# diff --git a/command/test-fixtures/push-no-upload/DOTgit/HEAD b/command/test-fixtures/push-no-upload/DOTgit/HEAD new file mode 100644 index 000000000..cb089cd89 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/command/test-fixtures/push-no-upload/DOTgit/config b/command/test-fixtures/push-no-upload/DOTgit/config new file mode 100644 index 000000000..6c9406b7d --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true diff --git a/command/test-fixtures/push-no-upload/DOTgit/description b/command/test-fixtures/push-no-upload/DOTgit/description new file mode 100644 index 000000000..498b267a8 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/command/test-fixtures/push-no-upload/DOTgit/hooks/applypatch-msg.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/applypatch-msg.sample new file mode 100755 index 000000000..a5d7b84a6 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/hooks/commit-msg.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/commit-msg.sample new file mode 100755 index 000000000..b58d1184a --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/hooks/post-update.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/post-update.sample new file mode 100755 index 000000000..ec17ec193 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-applypatch.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-applypatch.sample new file mode 100755 index 000000000..4142082bc --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-commit.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-commit.sample new file mode 100755 index 000000000..68d62d544 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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 --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/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-push.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-push.sample new file mode 100755 index 000000000..6187dbf43 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-rebase.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-rebase.sample new file mode 100755 index 000000000..9773ed4cb --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/hooks/prepare-commit-msg.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/prepare-commit-msg.sample new file mode 100755 index 000000000..f093a02ec --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/hooks/update.sample b/command/test-fixtures/push-no-upload/DOTgit/hooks/update.sample new file mode 100755 index 000000000..80ba94135 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/index b/command/test-fixtures/push-no-upload/DOTgit/index new file mode 100644 index 000000000..7e04fcefd Binary files /dev/null and b/command/test-fixtures/push-no-upload/DOTgit/index differ diff --git a/command/test-fixtures/push-no-upload/DOTgit/info/exclude b/command/test-fixtures/push-no-upload/DOTgit/info/exclude new file mode 100644 index 000000000..a5196d1be --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/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/command/test-fixtures/push-no-upload/DOTgit/logs/HEAD b/command/test-fixtures/push-no-upload/DOTgit/logs/HEAD new file mode 100644 index 000000000..023168a3a --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 e5c3215bf2e20a6963527249c44b789547ac5b8a Mitchell Hashimoto 1472015457 -0700 commit (initial): Commit diff --git a/command/test-fixtures/push-no-upload/DOTgit/logs/refs/heads/master b/command/test-fixtures/push-no-upload/DOTgit/logs/refs/heads/master new file mode 100644 index 000000000..023168a3a --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 e5c3215bf2e20a6963527249c44b789547ac5b8a Mitchell Hashimoto 1472015457 -0700 commit (initial): Commit diff --git a/command/test-fixtures/push-no-upload/DOTgit/objects/26/51626363b583e7f9a6482c58d8bf844de0c2a5 b/command/test-fixtures/push-no-upload/DOTgit/objects/26/51626363b583e7f9a6482c58d8bf844de0c2a5 new file mode 100644 index 000000000..b651cd64d Binary files /dev/null and b/command/test-fixtures/push-no-upload/DOTgit/objects/26/51626363b583e7f9a6482c58d8bf844de0c2a5 differ diff --git a/command/test-fixtures/push-no-upload/DOTgit/objects/33/5592e83f2a54dd43f86469f5a2a5d1f572f884 b/command/test-fixtures/push-no-upload/DOTgit/objects/33/5592e83f2a54dd43f86469f5a2a5d1f572f884 new file mode 100644 index 000000000..b17621836 Binary files /dev/null and b/command/test-fixtures/push-no-upload/DOTgit/objects/33/5592e83f2a54dd43f86469f5a2a5d1f572f884 differ diff --git a/command/test-fixtures/push-no-upload/DOTgit/objects/3f/a8c86b7b040e9ecdc9239dee660fcd2589bc94 b/command/test-fixtures/push-no-upload/DOTgit/objects/3f/a8c86b7b040e9ecdc9239dee660fcd2589bc94 new file mode 100644 index 000000000..f6b44caa5 Binary files /dev/null and b/command/test-fixtures/push-no-upload/DOTgit/objects/3f/a8c86b7b040e9ecdc9239dee660fcd2589bc94 differ diff --git a/command/test-fixtures/push-no-upload/DOTgit/objects/e5/c3215bf2e20a6963527249c44b789547ac5b8a b/command/test-fixtures/push-no-upload/DOTgit/objects/e5/c3215bf2e20a6963527249c44b789547ac5b8a new file mode 100644 index 000000000..2c7174086 --- /dev/null +++ b/command/test-fixtures/push-no-upload/DOTgit/objects/e5/c3215bf2e20a6963527249c44b789547ac5b8a @@ -0,0 +1,5 @@ +xKϪV;W9964mӍP@Qg:;|$+oVu>o@lA戴IH~H_<`"\"I<SOqF +1vj7N(~mȱP`E>"KtSST}oGwmtoN c6,} k\U"tv}e|]Tő^J"Cd;SyĎD/kFji=_{XVpD9QА` +L䖦oHGQ|8 nM/(OQt*=pl(µfXto3e%M]ڽ3᙭bh4r\K>@q xbI +