From e8267f4907510b50b8d5d0d92f129b141cfa7116 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 23 Aug 2016 22:11:21 -0700 Subject: [PATCH 1/7] command/push: failing test for pushing with no modules --- command/command_test.go | 36 ++++ command/push.go | 12 ++ command/push_test.go | 56 ++++++ .../test-fixtures/push-no-upload-2/.gitignore | 1 + .../push-no-upload-2/DOTgit/COMMIT_EDITMSG | 11 ++ .../push-no-upload-2/DOTgit/HEAD | 1 + .../push-no-upload-2/DOTgit/config | 7 + .../push-no-upload-2/DOTgit/description | 1 + .../DOTgit/hooks/applypatch-msg.sample | 15 ++ .../DOTgit/hooks/commit-msg.sample | 24 +++ .../DOTgit/hooks/post-update.sample | 8 + .../DOTgit/hooks/pre-applypatch.sample | 14 ++ .../DOTgit/hooks/pre-commit.sample | 49 +++++ .../DOTgit/hooks/pre-push.sample | 53 ++++++ .../DOTgit/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../DOTgit/hooks/prepare-commit-msg.sample | 36 ++++ .../DOTgit/hooks/update.sample | 128 +++++++++++++ .../push-no-upload-2/DOTgit/index | Bin 0 -> 217 bytes .../push-no-upload-2/DOTgit/info/exclude | 6 + .../push-no-upload-2/DOTgit/logs/HEAD | 1 + .../DOTgit/logs/refs/heads/master | 1 + .../1c/99dc138aa275b2577bc6d9d2c7b185aeeb27ad | Bin 0 -> 28 bytes .../1f/4379fc58839e6cdfd193d8a5333fee1f33d522 | 5 + .../ac/cd15f3424d1d4b83da634f608d89736b20c6a0 | 3 + .../d9/1d31d1722127534e4aef247ae651a75122d1be | Bin 0 -> 86 bytes .../push-no-upload-2/DOTgit/refs/heads/master | 1 + .../0aec430d87a09fa44453780d5bb00156/main.tf | 1 + .../push-no-upload-2/child/main.tf | 1 + .../test-fixtures/push-no-upload-2/main.tf | 1 + .../test-fixtures/push-no-upload/.gitignore | 1 + .../push-no-upload/DOTgit/COMMIT_EDITMSG | 11 ++ .../test-fixtures/push-no-upload/DOTgit/HEAD | 1 + .../push-no-upload/DOTgit/config | 7 + .../push-no-upload/DOTgit/description | 1 + .../DOTgit/hooks/applypatch-msg.sample | 15 ++ .../DOTgit/hooks/commit-msg.sample | 24 +++ .../DOTgit/hooks/post-update.sample | 8 + .../DOTgit/hooks/pre-applypatch.sample | 14 ++ .../DOTgit/hooks/pre-commit.sample | 49 +++++ .../DOTgit/hooks/pre-push.sample | 53 ++++++ .../DOTgit/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../DOTgit/hooks/prepare-commit-msg.sample | 36 ++++ .../push-no-upload/DOTgit/hooks/update.sample | 128 +++++++++++++ .../test-fixtures/push-no-upload/DOTgit/index | Bin 0 -> 217 bytes .../push-no-upload/DOTgit/info/exclude | 6 + .../push-no-upload/DOTgit/logs/HEAD | 1 + .../DOTgit/logs/refs/heads/master | 1 + .../26/51626363b583e7f9a6482c58d8bf844de0c2a5 | Bin 0 -> 71 bytes .../33/5592e83f2a54dd43f86469f5a2a5d1f572f884 | Bin 0 -> 86 bytes .../3f/a8c86b7b040e9ecdc9239dee660fcd2589bc94 | Bin 0 -> 27 bytes .../e5/c3215bf2e20a6963527249c44b789547ac5b8a | 5 + .../push-no-upload/DOTgit/refs/heads/master | 1 + .../0aec430d87a09fa44453780d5bb00156/main.tf | 1 + .../4e5bca89732a7fb77c3aa08aafa029b1/main.tf | 1 + command/test-fixtures/push-no-upload/main.tf | 5 + 55 files changed, 1179 insertions(+) create mode 100644 command/test-fixtures/push-no-upload-2/.gitignore create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/COMMIT_EDITMSG create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/HEAD create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/config create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/description create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/applypatch-msg.sample create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/commit-msg.sample create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/post-update.sample create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-applypatch.sample create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-commit.sample create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-push.sample create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-rebase.sample create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/prepare-commit-msg.sample create mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/update.sample create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/index create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/info/exclude create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/logs/HEAD create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/logs/refs/heads/master create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/objects/1c/99dc138aa275b2577bc6d9d2c7b185aeeb27ad create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/objects/1f/4379fc58839e6cdfd193d8a5333fee1f33d522 create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/objects/ac/cd15f3424d1d4b83da634f608d89736b20c6a0 create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/objects/d9/1d31d1722127534e4aef247ae651a75122d1be create mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/refs/heads/master create mode 100644 command/test-fixtures/push-no-upload-2/DOTterraform/modules/0aec430d87a09fa44453780d5bb00156/main.tf create mode 100644 command/test-fixtures/push-no-upload-2/child/main.tf create mode 100644 command/test-fixtures/push-no-upload-2/main.tf create mode 100644 command/test-fixtures/push-no-upload/.gitignore create mode 100644 command/test-fixtures/push-no-upload/DOTgit/COMMIT_EDITMSG create mode 100644 command/test-fixtures/push-no-upload/DOTgit/HEAD create mode 100644 command/test-fixtures/push-no-upload/DOTgit/config create mode 100644 command/test-fixtures/push-no-upload/DOTgit/description create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/applypatch-msg.sample create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/commit-msg.sample create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/post-update.sample create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/pre-applypatch.sample create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/pre-commit.sample create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/pre-push.sample create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/pre-rebase.sample create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/prepare-commit-msg.sample create mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/update.sample create mode 100644 command/test-fixtures/push-no-upload/DOTgit/index create mode 100644 command/test-fixtures/push-no-upload/DOTgit/info/exclude create mode 100644 command/test-fixtures/push-no-upload/DOTgit/logs/HEAD create mode 100644 command/test-fixtures/push-no-upload/DOTgit/logs/refs/heads/master create mode 100644 command/test-fixtures/push-no-upload/DOTgit/objects/26/51626363b583e7f9a6482c58d8bf844de0c2a5 create mode 100644 command/test-fixtures/push-no-upload/DOTgit/objects/33/5592e83f2a54dd43f86469f5a2a5d1f572f884 create mode 100644 command/test-fixtures/push-no-upload/DOTgit/objects/3f/a8c86b7b040e9ecdc9239dee660fcd2589bc94 create mode 100644 command/test-fixtures/push-no-upload/DOTgit/objects/e5/c3215bf2e20a6963527249c44b789547ac5b8a create mode 100644 command/test-fixtures/push-no-upload/DOTgit/refs/heads/master create mode 100644 command/test-fixtures/push-no-upload/DOTterraform/modules/0aec430d87a09fa44453780d5bb00156/main.tf create mode 100644 command/test-fixtures/push-no-upload/DOTterraform/modules/4e5bca89732a7fb77c3aa08aafa029b1/main.tf create mode 100644 command/test-fixtures/push-no-upload/main.tf diff --git a/command/command_test.go b/command/command_test.go index 01863ee39f..2104d33a93 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 d9dda82b7b..981b8c6d79 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 2f78dd6fa0..4697dfa4d5 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 0000000000..1c99dc138a --- /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 0000000000..4fbdfdf3ec --- /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 0000000000..cb089cd89a --- /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 0000000000..6c9406b7d9 --- /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 0000000000..498b267a8c --- /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 0000000000..a5d7b84a67 --- /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 0000000000..b58d1184a9 --- /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 0000000000..ec17ec1939 --- /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 0000000000..4142082bcb --- /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 0000000000..68d62d5446 --- /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 0000000000..6187dbf439 --- /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 0000000000..9773ed4cb2 --- /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 0000000000..f093a02ec4 --- /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 0000000000..80ba94135c --- /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 0000000000000000000000000000000000000000..f35cf6f9e50d9b6fd03d37fb923aafe62cde3619 GIT binary patch literal 217 zcmZ?q402{*U|<5_@V$ECK$-zYGcqu+GCE2!GcYtRVPIhV3X~E7Vjh{9cZ9nZm2L{J zK6dlc@r|wPUaPNV;L=OaEXhpI%P&d=nE?XfdyZX3rorYp9Oy(d@9~z&sAOklEpz# literal 0 HcmV?d00001 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 0000000000..a5196d1be8 --- /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 0000000000..fd338eebc3 --- /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 0000000000..fd338eebc3 --- /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 0000000000000000000000000000000000000000..3c6ac46c78edfbbcac6adaca6674071903ce67f1 GIT binary patch literal 28 kcmb4LVWu9lb2Y5h}IpEEHyGqA+~0GnV67XSbN literal 0 HcmV?d00001 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 0000000000..31fd3d9fa4 --- /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 0000000000..e47843fa93 --- /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 0000000000000000000000000000000000000000..ea1e36feaf8d5a6f8ad192f92ada7899fb34b128 GIT binary patch literal 86 zcmV-c0IC0Y0V^p=O;s>AW-v4`Ff%bx&`ZxO$xP47FG^*QnR!RJYf\).*$/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 0000000000..ec17ec1939 --- /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 0000000000..4142082bcb --- /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 0000000000..68d62d5446 --- /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 0000000000..6187dbf439 --- /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 0000000000..9773ed4cb2 --- /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 0000000000..f093a02ec4 --- /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 0000000000..80ba94135c --- /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 0000000000000000000000000000000000000000..7e04fcefd54a2da7e183235b5add4e3991bc3402 GIT binary patch literal 217 zcmZ?q402{*U|<5_@Vz>5K$-zYGcqu+GCH!iGB7kQVPIhV3X~E7Vs85tC$g(q_~xBG zsXX^x8vj|<&OK8Yxb)I9OES~*@{3YIW`IEWUM)Rj8f>1!4`wv;Y}Epjl9RVKKmWPR zLnq?K{ubW{hn6z1=O$+6>6N4b4G0Nxbp=wA3`PnDT*jf3Uf64e+;#qulKFMf(u-e< cezc?u?w#=dL$t!{ 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 0000000000..023168a3ae --- /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 0000000000000000000000000000000000000000..b651cd64d5c071bb58c946d0b48573ae966bb034 GIT binary patch literal 71 zcmV-N0J#5n0ZYosPf{>5WGG54&Mz%WPE}A!EH94F%quQQ%u7yHQcz0E&sS2YuI1uN dEXheMR;cDu0D`>4+*Acyh$L4n7XTN26*usg8{hx{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b1762183693b72af0a76a9a01205e1c4edc59aa8 GIT binary patch literal 86 zcmV-c0IC0Y0V^p=O;s>AW-v4`Ff%bx&`ZxO$xP47FG^*wUvVP4nuTxP*^|n1-=*=N sRqfm}1*$4HF*8rEB#l8WFey2CYxDD;%RF=0 literal 0 HcmV?d00001 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 0000000000..2c7174086b --- /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 + Date: Tue, 23 Aug 2016 22:51:37 -0700 Subject: [PATCH 2/7] command/push: removed all the git stuff, turns out it doesn't matter --- command/push_test.go | 3 +- .../test-fixtures/push-no-upload-2/.gitignore | 1 - .../push-no-upload-2/DOTgit/COMMIT_EDITMSG | 11 -- .../push-no-upload-2/DOTgit/HEAD | 1 - .../push-no-upload-2/DOTgit/config | 7 - .../push-no-upload-2/DOTgit/description | 1 - .../DOTgit/hooks/applypatch-msg.sample | 15 -- .../DOTgit/hooks/commit-msg.sample | 24 --- .../DOTgit/hooks/post-update.sample | 8 - .../DOTgit/hooks/pre-applypatch.sample | 14 -- .../DOTgit/hooks/pre-commit.sample | 49 ----- .../DOTgit/hooks/pre-push.sample | 53 ------ .../DOTgit/hooks/pre-rebase.sample | 169 ------------------ .../DOTgit/hooks/prepare-commit-msg.sample | 36 ---- .../DOTgit/hooks/update.sample | 128 ------------- .../push-no-upload-2/DOTgit/index | Bin 217 -> 0 bytes .../push-no-upload-2/DOTgit/info/exclude | 6 - .../push-no-upload-2/DOTgit/logs/HEAD | 1 - .../DOTgit/logs/refs/heads/master | 1 - .../1c/99dc138aa275b2577bc6d9d2c7b185aeeb27ad | Bin 28 -> 0 bytes .../1f/4379fc58839e6cdfd193d8a5333fee1f33d522 | 5 - .../ac/cd15f3424d1d4b83da634f608d89736b20c6a0 | 3 - .../d9/1d31d1722127534e4aef247ae651a75122d1be | Bin 86 -> 0 bytes .../push-no-upload-2/DOTgit/refs/heads/master | 1 - 24 files changed, 1 insertion(+), 536 deletions(-) delete mode 100644 command/test-fixtures/push-no-upload-2/.gitignore delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/COMMIT_EDITMSG delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/HEAD delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/config delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/description delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/applypatch-msg.sample delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/commit-msg.sample delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/post-update.sample delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-applypatch.sample delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-commit.sample delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-push.sample delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-rebase.sample delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/prepare-commit-msg.sample delete mode 100755 command/test-fixtures/push-no-upload-2/DOTgit/hooks/update.sample delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/index delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/info/exclude delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/logs/HEAD delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/logs/refs/heads/master delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/objects/1c/99dc138aa275b2577bc6d9d2c7b185aeeb27ad delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/objects/1f/4379fc58839e6cdfd193d8a5333fee1f33d522 delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/objects/ac/cd15f3424d1d4b83da634f608d89736b20c6a0 delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/objects/d9/1d31d1722127534e4aef247ae651a75122d1be delete mode 100644 command/test-fixtures/push-no-upload-2/DOTgit/refs/heads/master diff --git a/command/push_test.go b/command/push_test.go index 4697dfa4d5..9797179f77 100644 --- a/command/push_test.go +++ b/command/push_test.go @@ -92,7 +92,6 @@ func TestPush_noUploadModules(t *testing.T) { // 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)() @@ -105,7 +104,7 @@ func TestPush_noUploadModules(t *testing.T) { s := terraform.NewState() s.Serial = 5 s.Remote = conf - testStateFileRemote(t, s) + defer os.Remove(testStateFileRemote(t, s)) args := []string{ "-name=mitchellh/tf-test", diff --git a/command/test-fixtures/push-no-upload-2/.gitignore b/command/test-fixtures/push-no-upload-2/.gitignore deleted file mode 100644 index 1c99dc138a..0000000000 --- a/command/test-fixtures/push-no-upload-2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.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 deleted file mode 100644 index 4fbdfdf3ec..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/COMMIT_EDITMSG +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index cb089cd89a..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/HEAD +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 6c9406b7d9..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/config +++ /dev/null @@ -1,7 +0,0 @@ -[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 deleted file mode 100644 index 498b267a8c..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/description +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100755 index a5d7b84a67..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 deleted file mode 100755 index b58d1184a9..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100755 index ec17ec1939..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100755 index 4142082bcb..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 deleted file mode 100755 index 68d62d5446..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/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 deleted file mode 100755 index 6187dbf439..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/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 deleted file mode 100755 index 9773ed4cb2..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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 deleted file mode 100755 index f093a02ec4..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,36 +0,0 @@ -#!/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 deleted file mode 100755 index 80ba94135c..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/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 deleted file mode 100644 index f35cf6f9e50d9b6fd03d37fb923aafe62cde3619..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmZ?q402{*U|<5_@V$ECK$-zYGcqu+GCE2!GcYtRVPIhV3X~E7Vjh{9cZ9nZm2L{J zK6dlc@r|wPUaPNV;L=OaEXhpI%P&d=nE?XfdyZX3rorYp9Oy(d@9~z&sAOklEpz# diff --git a/command/test-fixtures/push-no-upload-2/DOTgit/info/exclude b/command/test-fixtures/push-no-upload-2/DOTgit/info/exclude deleted file mode 100644 index a5196d1be8..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# 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 deleted file mode 100644 index fd338eebc3..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/logs/HEAD +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index fd338eebc3..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3c6ac46c78edfbbcac6adaca6674071903ce67f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28 kcmb4LVWu9lb2Y5h}IpEEHyGqA+~0GnV67XSbN 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 deleted file mode 100644 index 31fd3d9fa4..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/objects/1f/4379fc58839e6cdfd193d8a5333fee1f33d522 +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index e47843fa93..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTgit/objects/ac/cd15f3424d1d4b83da634f608d89736b20c6a0 +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index ea1e36feaf8d5a6f8ad192f92ada7899fb34b128..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s>AW-v4`Ff%bx&`ZxO$xP47FG^*QnR!RJYf Date: Tue, 23 Aug 2016 22:58:58 -0700 Subject: [PATCH 3/7] command/push: "Extra" value must be absolute --- command/push.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/command/push.go b/command/push.go index 981b8c6d79..37dbf5a69c 100644 --- a/command/push.go +++ b/command/push.go @@ -191,12 +191,21 @@ func (c *PushCommand) Run(args []string) int { return 1 } + // Get the absolute path for our data directory, since the Extra field + // value below needs to be absolute. + dataDirAbs, err := filepath.Abs(c.DataDir()) + if err != nil { + c.Ui.Error(fmt.Sprintf( + "Error while expanding the data directory %q: %s", c.DataDir(), err)) + return 1 + } + // Build the archiving options, which includes everything it can // by default according to VCS rules but forcing the data directory. archiveOpts := &archive.ArchiveOpts{ VCS: archiveVCS, Extra: map[string]string{ - DefaultDataDir: c.DataDir(), + DefaultDataDir: dataDirAbs, }, } if !moduleUpload { From a650455ed64e30130f64217dc99f5717e937f8e8 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 23 Aug 2016 23:12:52 -0700 Subject: [PATCH 4/7] command/push: only explicitly include the state modify the module include flag to flag whether we explicitly include or exclude modules --- command/push.go | 30 ++++++++++++------------------ command/push_test.go | 4 ++-- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/command/push.go b/command/push.go index 37dbf5a69c..67f8815222 100644 --- a/command/push.go +++ b/command/push.go @@ -203,20 +203,24 @@ func (c *PushCommand) Run(args []string) int { // Build the archiving options, which includes everything it can // by default according to VCS rules but forcing the data directory. archiveOpts := &archive.ArchiveOpts{ - VCS: archiveVCS, - Extra: map[string]string{ - DefaultDataDir: dataDirAbs, - }, + VCS: archiveVCS, + Extra: make(map[string]string), } - if !moduleUpload { - // If we're not uploading modules, then exclude the modules dir. + + // Always store the state file in here so we can find state + statePathKey := fmt.Sprintf("%s/%s", DefaultDataDir, DefaultStateFilename) + archiveOpts.Extra[statePathKey] = filepath.Join(dataDirAbs, DefaultStateFilename) + if moduleUpload { + // If we're uploading modules, explicitly add that + moduleKey := fmt.Sprintf("%s/%s", DefaultDataDir, "modules") + archiveOpts.Extra[moduleKey] = filepath.Join(dataDirAbs, "modules") + } else { + // If we're not uploading modules, explicitly exclude add that archiveOpts.Exclude = append( archiveOpts.Exclude, filepath.Join(c.DataDir(), "modules")) } - println(fmt.Sprintf("%#v", archiveOpts)) - archiveR, err := archive.CreateArchive(configPath, archiveOpts) if err != nil { c.Ui.Error(fmt.Sprintf( @@ -225,16 +229,6 @@ 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 9797179f77..669b5b1287 100644 --- a/command/push_test.go +++ b/command/push_test.go @@ -117,9 +117,9 @@ func TestPush_noUploadModules(t *testing.T) { actual := testArchiveStr(t, archivePath) expected := []string{ - ".gitignore", - ".terraform/", ".terraform/terraform.tfstate", + "child/", + "child/main.tf", "main.tf", } if !reflect.DeepEqual(actual, expected) { From 92b15de080b5f2767c3d9a0f3f2e4eff29f525c8 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 23 Aug 2016 23:16:14 -0700 Subject: [PATCH 5/7] command/push: remove the old test fixture for the new one --- command/push_test.go | 2 +- .../0aec430d87a09fa44453780d5bb00156/main.tf | 1 - .../test-fixtures/push-no-upload-2/main.tf | 1 - .../test-fixtures/push-no-upload/.gitignore | 1 - .../push-no-upload/DOTgit/COMMIT_EDITMSG | 11 -- .../test-fixtures/push-no-upload/DOTgit/HEAD | 1 - .../push-no-upload/DOTgit/config | 7 - .../push-no-upload/DOTgit/description | 1 - .../DOTgit/hooks/applypatch-msg.sample | 15 -- .../DOTgit/hooks/commit-msg.sample | 24 --- .../DOTgit/hooks/post-update.sample | 8 - .../DOTgit/hooks/pre-applypatch.sample | 14 -- .../DOTgit/hooks/pre-commit.sample | 49 ----- .../DOTgit/hooks/pre-push.sample | 53 ------ .../DOTgit/hooks/pre-rebase.sample | 169 ------------------ .../DOTgit/hooks/prepare-commit-msg.sample | 36 ---- .../push-no-upload/DOTgit/hooks/update.sample | 128 ------------- .../test-fixtures/push-no-upload/DOTgit/index | Bin 217 -> 0 bytes .../push-no-upload/DOTgit/info/exclude | 6 - .../push-no-upload/DOTgit/logs/HEAD | 1 - .../DOTgit/logs/refs/heads/master | 1 - .../26/51626363b583e7f9a6482c58d8bf844de0c2a5 | Bin 71 -> 0 bytes .../33/5592e83f2a54dd43f86469f5a2a5d1f572f884 | Bin 86 -> 0 bytes .../3f/a8c86b7b040e9ecdc9239dee660fcd2589bc94 | Bin 27 -> 0 bytes .../e5/c3215bf2e20a6963527249c44b789547ac5b8a | 5 - .../push-no-upload/DOTgit/refs/heads/master | 1 - .../4e5bca89732a7fb77c3aa08aafa029b1/main.tf | 1 - .../child/main.tf | 0 command/test-fixtures/push-no-upload/main.tf | 6 +- 29 files changed, 2 insertions(+), 540 deletions(-) delete mode 100644 command/test-fixtures/push-no-upload-2/DOTterraform/modules/0aec430d87a09fa44453780d5bb00156/main.tf delete mode 100644 command/test-fixtures/push-no-upload-2/main.tf delete mode 100644 command/test-fixtures/push-no-upload/.gitignore delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/COMMIT_EDITMSG delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/HEAD delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/config delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/description delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/applypatch-msg.sample delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/commit-msg.sample delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/post-update.sample delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/pre-applypatch.sample delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/pre-commit.sample delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/pre-push.sample delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/pre-rebase.sample delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/prepare-commit-msg.sample delete mode 100755 command/test-fixtures/push-no-upload/DOTgit/hooks/update.sample delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/index delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/info/exclude delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/logs/HEAD delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/logs/refs/heads/master delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/objects/26/51626363b583e7f9a6482c58d8bf844de0c2a5 delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/objects/33/5592e83f2a54dd43f86469f5a2a5d1f572f884 delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/objects/3f/a8c86b7b040e9ecdc9239dee660fcd2589bc94 delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/objects/e5/c3215bf2e20a6963527249c44b789547ac5b8a delete mode 100644 command/test-fixtures/push-no-upload/DOTgit/refs/heads/master delete mode 100644 command/test-fixtures/push-no-upload/DOTterraform/modules/4e5bca89732a7fb77c3aa08aafa029b1/main.tf rename command/test-fixtures/{push-no-upload-2 => push-no-upload}/child/main.tf (100%) diff --git a/command/push_test.go b/command/push_test.go index 669b5b1287..7f8d70d0d1 100644 --- a/command/push_test.go +++ b/command/push_test.go @@ -90,7 +90,7 @@ func TestPush_noUploadModules(t *testing.T) { // 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") + path := testFixturePath("push-no-upload") defer testRename(t, path, "DOTterraform", ".terraform")() // Move into that directory 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 deleted file mode 100644 index fec56017dc..0000000000 --- a/command/test-fixtures/push-no-upload-2/DOTterraform/modules/0aec430d87a09fa44453780d5bb00156/main.tf +++ /dev/null @@ -1 +0,0 @@ -# Hello diff --git a/command/test-fixtures/push-no-upload-2/main.tf b/command/test-fixtures/push-no-upload-2/main.tf deleted file mode 100644 index c70c8b6111..0000000000 --- a/command/test-fixtures/push-no-upload-2/main.tf +++ /dev/null @@ -1 +0,0 @@ -module "example" { source = "./child" } diff --git a/command/test-fixtures/push-no-upload/.gitignore b/command/test-fixtures/push-no-upload/.gitignore deleted file mode 100644 index 3fa8c86b7b..0000000000 --- a/command/test-fixtures/push-no-upload/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.terraform diff --git a/command/test-fixtures/push-no-upload/DOTgit/COMMIT_EDITMSG b/command/test-fixtures/push-no-upload/DOTgit/COMMIT_EDITMSG deleted file mode 100644 index 3c1abcfc91..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/COMMIT_EDITMSG +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index cb089cd89a..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/command/test-fixtures/push-no-upload/DOTgit/config b/command/test-fixtures/push-no-upload/DOTgit/config deleted file mode 100644 index 6c9406b7d9..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/config +++ /dev/null @@ -1,7 +0,0 @@ -[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 deleted file mode 100644 index 498b267a8c..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/description +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100755 index a5d7b84a67..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 deleted file mode 100755 index b58d1184a9..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100755 index ec17ec1939..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100755 index 4142082bcb..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 deleted file mode 100755 index 68d62d5446..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/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 deleted file mode 100755 index 6187dbf439..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/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 deleted file mode 100755 index 9773ed4cb2..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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 deleted file mode 100755 index f093a02ec4..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,36 +0,0 @@ -#!/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 deleted file mode 100755 index 80ba94135c..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/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 deleted file mode 100644 index 7e04fcefd54a2da7e183235b5add4e3991bc3402..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmZ?q402{*U|<5_@Vz>5K$-zYGcqu+GCH!iGB7kQVPIhV3X~E7Vs85tC$g(q_~xBG zsXX^x8vj|<&OK8Yxb)I9OES~*@{3YIW`IEWUM)Rj8f>1!4`wv;Y}Epjl9RVKKmWPR zLnq?K{ubW{hn6z1=O$+6>6N4b4G0Nxbp=wA3`PnDT*jf3Uf64e+;#qulKFMf(u-e< cezc?u?w#=dL$t!{ 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 deleted file mode 100644 index 023168a3ae..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/logs/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index b651cd64d5c071bb58c946d0b48573ae966bb034..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71 zcmV-N0J#5n0ZYosPf{>5WGG54&Mz%WPE}A!EH94F%quQQ%u7yHQcz0E&sS2YuI1uN dEXheMR;cDu0D`>4+*Acyh$L4n7XTN26*usg8{hx{ diff --git a/command/test-fixtures/push-no-upload/DOTgit/objects/33/5592e83f2a54dd43f86469f5a2a5d1f572f884 b/command/test-fixtures/push-no-upload/DOTgit/objects/33/5592e83f2a54dd43f86469f5a2a5d1f572f884 deleted file mode 100644 index b1762183693b72af0a76a9a01205e1c4edc59aa8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s>AW-v4`Ff%bx&`ZxO$xP47FG^*wUvVP4nuTxP*^|n1-=*=N sRqfm}1*$4HF*8rEB#l8WFey2CYxDD;%RF=0 diff --git a/command/test-fixtures/push-no-upload/DOTgit/objects/e5/c3215bf2e20a6963527249c44b789547ac5b8a b/command/test-fixtures/push-no-upload/DOTgit/objects/e5/c3215bf2e20a6963527249c44b789547ac5b8a deleted file mode 100644 index 2c7174086b..0000000000 --- a/command/test-fixtures/push-no-upload/DOTgit/objects/e5/c3215bf2e20a6963527249c44b789547ac5b8a +++ /dev/null @@ -1,5 +0,0 @@ -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 - Date: Tue, 23 Aug 2016 23:19:02 -0700 Subject: [PATCH 6/7] command/push: only add module directory to tar if it exists --- command/push.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/command/push.go b/command/push.go index 67f8815222..84ff5afb59 100644 --- a/command/push.go +++ b/command/push.go @@ -211,9 +211,18 @@ func (c *PushCommand) Run(args []string) int { statePathKey := fmt.Sprintf("%s/%s", DefaultDataDir, DefaultStateFilename) archiveOpts.Extra[statePathKey] = filepath.Join(dataDirAbs, DefaultStateFilename) if moduleUpload { - // If we're uploading modules, explicitly add that + // If we're uploading modules, explicitly add that directory if exists. moduleKey := fmt.Sprintf("%s/%s", DefaultDataDir, "modules") - archiveOpts.Extra[moduleKey] = filepath.Join(dataDirAbs, "modules") + moduleDir := filepath.Join(dataDirAbs, "modules") + _, err := os.Stat(moduleDir) + if err == nil { + archiveOpts.Extra[moduleKey] = filepath.Join(dataDirAbs, "modules") + } + if err != nil && !os.IsNotExist(err) { + c.Ui.Error(fmt.Sprintf( + "Error checking for module dir %q: %s", moduleDir, err)) + return 1 + } } else { // If we're not uploading modules, explicitly exclude add that archiveOpts.Exclude = append( From 9a8209cfbd3a9e9d8c84dfc10039c4f5d054bc3a Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 24 Aug 2016 10:39:50 -0700 Subject: [PATCH 7/7] command/push: create the proper parent directory entries in tar --- command/push.go | 6 ++-- command/push_test.go | 1 + .../hashicorp/atlas-go/archive/archive.go | 28 +++++++++++++++++++ vendor/vendor.json | 4 ++- 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/command/push.go b/command/push.go index 84ff5afb59..db2ae3db43 100644 --- a/command/push.go +++ b/command/push.go @@ -203,8 +203,10 @@ func (c *PushCommand) Run(args []string) int { // Build the archiving options, which includes everything it can // by default according to VCS rules but forcing the data directory. archiveOpts := &archive.ArchiveOpts{ - VCS: archiveVCS, - Extra: make(map[string]string), + VCS: archiveVCS, + Extra: map[string]string{ + DefaultDataDir: archive.ExtraEntryDir, + }, } // Always store the state file in here so we can find state diff --git a/command/push_test.go b/command/push_test.go index 7f8d70d0d1..2fdbf2f268 100644 --- a/command/push_test.go +++ b/command/push_test.go @@ -117,6 +117,7 @@ func TestPush_noUploadModules(t *testing.T) { actual := testArchiveStr(t, archivePath) expected := []string{ + ".terraform/", ".terraform/terraform.tfstate", "child/", "child/main.tf", diff --git a/vendor/github.com/hashicorp/atlas-go/archive/archive.go b/vendor/github.com/hashicorp/atlas-go/archive/archive.go index d9232b4f0e..0a025b21f7 100644 --- a/vendor/github.com/hashicorp/atlas-go/archive/archive.go +++ b/vendor/github.com/hashicorp/atlas-go/archive/archive.go @@ -50,6 +50,12 @@ func (o *ArchiveOpts) IsSet() bool { return len(o.Exclude) > 0 || len(o.Include) > 0 || o.VCS } +// Constants related to setting special values for Extra in ArchiveOpts. +const ( + // ExtraEntryDir just creates the Extra key as a directory entry. + ExtraEntryDir = "" +) + // CreateArchive takes the given path and ArchiveOpts and archives it. // // The archive will be fully completed and put into a temporary file. @@ -419,7 +425,29 @@ func copyConcreteEntry( } func copyExtras(w *tar.Writer, extra map[string]string) error { + var tmpDir string + defer func() { + if tmpDir != "" { + os.RemoveAll(tmpDir) + } + }() + for entry, path := range extra { + // If the path is empty, then we set it to a generic empty directory + if path == "" { + // If tmpDir is still empty, then we create an empty dir + if tmpDir == "" { + td, err := ioutil.TempDir("", "archive") + if err != nil { + return err + } + + tmpDir = td + } + + path = tmpDir + } + info, err := os.Stat(path) if err != nil { return err diff --git a/vendor/vendor.json b/vendor/vendor.json index f1401fc404..78227755a9 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1083,9 +1083,11 @@ "revision": "c0cf0cb802adad24252ce1307c4c896edd566870" }, { + "checksumSHA1": "FUiF2WLrih0JdHsUTMMDz3DRokw=", "comment": "20141209094003-92-g95fa852", "path": "github.com/hashicorp/atlas-go/archive", - "revision": "95fa852edca41c06c4ce526af4bb7dec4eaad434" + "revision": "8e45a6c8b2de014db767a42c3ee777f101e11624", + "revisionTime": "2016-08-24T17:34:10Z" }, { "checksumSHA1": "yylO3hSRKd0T4mveT9ho2OSARwU=",