From 2b2cbf224713f1019b98da1324bb6534a95fee9d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 31 Jul 2014 19:42:30 -0700 Subject: [PATCH] Fix git tests --- .../config/server/EncryptionController.java | 2 +- .../server/JGitEnvironmentRepository.java | 24 ++- .../JGitEnvironmentRepositoryTests.java | 36 ++-- .../resources/config-repo/git/COMMIT_EDITMSG | 1 - .../test/resources/config-repo/git/FETCH_HEAD | 2 + .../src/test/resources/config-repo/git/config | 2 +- .../resources/config-repo/git/description | 1 - .../test/resources/config-repo/git/gitk.cache | 3 + .../git/hooks/applypatch-msg.sample | 15 -- .../config-repo/git/hooks/commit-msg.sample | 24 --- .../config-repo/git/hooks/post-update.sample | 8 - .../git/hooks/pre-applypatch.sample | 14 -- .../config-repo/git/hooks/pre-commit.sample | 49 ----- .../config-repo/git/hooks/pre-push.sample | 54 ------ .../config-repo/git/hooks/pre-rebase.sample | 169 ------------------ .../git/hooks/prepare-commit-msg.sample | 36 ---- .../config-repo/git/hooks/update.sample | 128 ------------- .../src/test/resources/config-repo/git/index | Bin 192 -> 192 bytes .../resources/config-repo/git/info/exclude | 6 - .../test/resources/config-repo/git/logs/HEAD | 4 +- .../config-repo/git/logs/refs/heads/master | 2 +- .../config-repo/git/logs/refs/heads/raw | 3 +- .../6f/6575624c9446c064fa83cc8c32d2dd5fafcca3 | Bin 99 -> 0 bytes .../7d/aacd5db8d36bc6df962d1d01cb98d8713fe5c4 | Bin 23 -> 0 bytes .../7d/f4a26d5437d9d4090cd5809967f870444cde8f | Bin 158 -> 0 bytes .../87/91c22849104e1c8795747ccb678879a7c16771 | Bin 32 -> 0 bytes .../9f/01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 | 3 - .../bf/2861eb6e56b7560b825c010c61353353695b33 | Bin 98 -> 0 bytes .../d6/acc4059dae71916bc26e3092f08b24e4d7acae | Bin 42 -> 0 bytes ...edd2290fa647beaa1255881228dc90c1d53fce.idx | Bin 0 -> 1268 bytes ...dd2290fa647beaa1255881228dc90c1d53fce.pack | Bin 0 -> 571 bytes .../resources/config-repo/git/refs/tags/foo | 1 + 32 files changed, 50 insertions(+), 537 deletions(-) delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/FETCH_HEAD delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/description create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/gitk.cache delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/applypatch-msg.sample delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/commit-msg.sample delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/post-update.sample delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-applypatch.sample delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-commit.sample delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-push.sample delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-rebase.sample delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/prepare-commit-msg.sample delete mode 100755 spring-platform-config-server/src/test/resources/config-repo/git/hooks/update.sample delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/info/exclude delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/6f/6575624c9446c064fa83cc8c32d2dd5fafcca3 delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/7d/aacd5db8d36bc6df962d1d01cb98d8713fe5c4 delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/7d/f4a26d5437d9d4090cd5809967f870444cde8f delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/87/91c22849104e1c8795747ccb678879a7c16771 delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/9f/01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/bf/2861eb6e56b7560b825c010c61353353695b33 delete mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/d6/acc4059dae71916bc26e3092f08b24e4d7acae create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.idx create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.pack create mode 100644 spring-platform-config-server/src/test/resources/config-repo/git/refs/tags/foo diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java index f207bfc9..b1d55819 100644 --- a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java +++ b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/EncryptionController.java @@ -150,7 +150,7 @@ public class EncryptionController { @ExceptionHandler(InvalidCipherException.class) @ResponseBody - public ResponseEntity> invlidCipher() { + public ResponseEntity> invalidCipher() { Map body = new HashMap(); body.put("status", "INVALID"); body.put("description", "Text not encrypted with this key"); diff --git a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java index 29a1785d..5e3a9be8 100644 --- a/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java +++ b/spring-platform-config-server/src/main/java/org/springframework/platform/config/server/JGitEnvironmentRepository.java @@ -30,6 +30,7 @@ import org.eclipse.jgit.api.ListBranchCommand; import org.eclipse.jgit.api.ListBranchCommand.ListMode; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.transport.TagOpt; import org.eclipse.jgit.util.FileUtils; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.platform.config.Environment; @@ -99,7 +100,12 @@ public class JGitEnvironmentRepository implements EnvironmentRepository { Git git; if (new File(basedir, ".git").exists()) { git = Git.open(basedir); - git.fetch().call(); + try { + git.fetch().call(); + } + catch (Exception e) { + logger.warn("Remote repository not available"); + } } else { if (basedir.exists()) { @@ -117,18 +123,19 @@ public class JGitEnvironmentRepository implements EnvironmentRepository { Environment result; synchronized (this) { SpringApplicationEnvironmentRepository environment = new SpringApplicationEnvironmentRepository(); - git.fetch().call(); - git.getRepository().getConfig().setString("branch", label, "merge", label); + git.getRepository().getConfig() + .setString("branch", label, "merge", label); CheckoutCommand checkout = git.checkout(); if (isBranch(git, label) && !isLocalBranch(git, label)) { trackBranch(git, checkout, label); } else { + git.fetch().setTagOpt(TagOpt.FETCH_TAGS).call(); // works for tags and local branches checkout.setName(label); } Ref ref = checkout.call(); - if (git.status().call().isClean() && ref!=null) { + if (git.status().call().isClean() && ref != null) { // Assumes we are on a tracking branch (should be safe) git.pull().call(); } @@ -152,14 +159,15 @@ public class JGitEnvironmentRepository implements EnvironmentRepository { private boolean isBranch(Git git, String label) throws GitAPIException { return containsBranch(git, label, ListMode.ALL); } - + private boolean isLocalBranch(Git git, String label) throws GitAPIException { return containsBranch(git, label, null); } - - private boolean containsBranch(Git git, String label, ListMode listMode) throws GitAPIException { + + private boolean containsBranch(Git git, String label, ListMode listMode) + throws GitAPIException { ListBranchCommand command = git.branchList(); - if (listMode!=null) { + if (listMode != null) { command.setListMode(listMode); } List branches = command.call(); diff --git a/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java b/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java index 6fa5fb57..b3e63f2e 100644 --- a/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java +++ b/spring-platform-config-server/src/test/java/org/springframework/platform/config/server/JGitEnvironmentRepositoryTests.java @@ -39,7 +39,8 @@ import com.jcraft.jsch.Session; public class JGitEnvironmentRepositoryTests { private StandardEnvironment environment = new StandardEnvironment(); - private JGitEnvironmentRepository repository = new JGitEnvironmentRepository(environment); + private JGitEnvironmentRepository repository = new JGitEnvironmentRepository( + environment); private File basedir = new File("target/config-repo"); @@ -51,8 +52,17 @@ public class JGitEnvironmentRepositoryTests { session.setConfig("StrictHostKeyChecking", "no"); } }); - new File("target/test-classes/config-repo/git").renameTo(new File("target/test-classes/config-repo/.git")); - repository.setUri(environment.resolvePlaceholders("${user.name}@localhost:${user.dir}/target/test-classes/config-repo")); + File dotGit = new File("target/test-classes/config-repo/.git"); + File git = new File("target/test-classes/config-repo/git"); + if (git.exists()) { + if (dotGit.exists()) { + FileUtils.delete(dotGit, FileUtils.RECURSIVE); + } + } + git.renameTo(dotGit); + repository + .setUri(environment + .resolvePlaceholders("${user.name}@localhost:${user.dir}/target/test-classes/config-repo")); if (basedir.exists()) { FileUtils.delete(basedir, FileUtils.RECURSIVE); } @@ -63,8 +73,8 @@ public class JGitEnvironmentRepositoryTests { repository.findOne("bar", "staging", "master"); Environment environment = repository.findOne("bar", "staging", "master"); assertEquals(2, environment.getPropertySources().size()); - assertEquals(repository.getUri() + "/bar.properties", - environment.getPropertySources().get(0).getName()); + assertEquals(repository.getUri() + "/bar.properties", environment + .getPropertySources().get(0).getName()); } @Test @@ -72,8 +82,8 @@ public class JGitEnvironmentRepositoryTests { repository.setBasedir(basedir); Environment environment = repository.findOne("bar", "staging", "raw"); assertEquals(2, environment.getPropertySources().size()); - assertEquals(repository.getUri() + "/bar.properties", - environment.getPropertySources().get(0).getName()); + assertEquals(repository.getUri() + "/bar.properties", environment + .getPropertySources().get(0).getName()); } @Test @@ -81,8 +91,8 @@ public class JGitEnvironmentRepositoryTests { repository.setBasedir(basedir); Environment environment = repository.findOne("bar", "staging", "foo"); assertEquals(2, environment.getPropertySources().size()); - assertEquals(repository.getUri() + "/bar.properties", - environment.getPropertySources().get(0).getName()); + assertEquals(repository.getUri() + "/bar.properties", environment + .getPropertySources().get(0).getName()); } @Test @@ -91,8 +101,8 @@ public class JGitEnvironmentRepositoryTests { repository.findOne("bar", "staging", "master"); Environment environment = repository.findOne("bar", "staging", "master"); assertEquals(2, environment.getPropertySources().size()); - assertEquals(repository.getUri() + "/bar.properties", - environment.getPropertySources().get(0).getName()); + assertEquals(repository.getUri() + "/bar.properties", environment + .getPropertySources().get(0).getName()); } @Test @@ -103,8 +113,8 @@ public class JGitEnvironmentRepositoryTests { repository.findOne("bar", "staging", "master"); Environment environment = repository.findOne("bar", "staging", "master"); assertEquals(2, environment.getPropertySources().size()); - assertEquals(repository.getUri() + "/bar.properties", - environment.getPropertySources().get(0).getName()); + assertEquals(repository.getUri() + "/bar.properties", environment + .getPropertySources().get(0).getName()); } } diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG b/spring-platform-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG deleted file mode 100644 index 5cda8c49..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/COMMIT_EDITMSG +++ /dev/null @@ -1 +0,0 @@ -Raw diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/FETCH_HEAD b/spring-platform-config-server/src/test/resources/config-repo/git/FETCH_HEAD new file mode 100644 index 00000000..527abd40 --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/FETCH_HEAD @@ -0,0 +1,2 @@ +7df4a26d5437d9d4090cd5809967f870444cde8f not-for-merge branch 'raw' of dsyer@localhost:/home/dsyer/dev/platform/config/spring-platform-config-server/target/test-classes/config-repo +7df4a26d5437d9d4090cd5809967f870444cde8f not-for-merge tag 'foo' of dsyer@localhost:/home/dsyer/dev/platform/config/spring-platform-config-server/target/test-classes/config-repo diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/config b/spring-platform-config-server/src/test/resources/config-repo/git/config index 515f4836..9b73bf82 100644 --- a/spring-platform-config-server/src/test/resources/config-repo/git/config +++ b/spring-platform-config-server/src/test/resources/config-repo/git/config @@ -1,5 +1,5 @@ [core] repositoryformatversion = 0 filemode = true - bare = false logallrefupdates = true +[branch "raw"] diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/description b/spring-platform-config-server/src/test/resources/config-repo/git/description deleted file mode 100644 index 498b267a..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/gitk.cache b/spring-platform-config-server/src/test/resources/config-repo/git/gitk.cache new file mode 100644 index 00000000..b420ccba --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/gitk.cache @@ -0,0 +1,3 @@ +1 1 +7df4a26d5437d9d4090cd5809967f870444cde8f 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 +1 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/applypatch-msg.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/applypatch-msg.sample deleted file mode 100755 index 8b2a2fe8..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/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 -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} -: diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/commit-msg.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/commit-msg.sample deleted file mode 100755 index b58d1184..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/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/spring-platform-config-server/src/test/resources/config-repo/git/hooks/post-update.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/post-update.sample deleted file mode 100755 index ec17ec19..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/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/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-applypatch.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-applypatch.sample deleted file mode 100755 index b1f187c2..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/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 -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} -: diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-commit.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-commit.sample deleted file mode 100755 index 68d62d54..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/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/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-push.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-push.sample deleted file mode 100755 index 1f3bcebf..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-push.sample +++ /dev/null @@ -1,54 +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 - -IFS=' ' -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-rebase.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/pre-rebase.sample deleted file mode 100755 index 33730ca6..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/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 - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/prepare-commit-msg.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/prepare-commit-msg.sample deleted file mode 100755 index f093a02e..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/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/spring-platform-config-server/src/test/resources/config-repo/git/hooks/update.sample b/spring-platform-config-server/src/test/resources/config-repo/git/hooks/update.sample deleted file mode 100755 index d8475837..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to blocks unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/index b/spring-platform-config-server/src/test/resources/config-repo/git/index index f71470a6ea5ece3fcf530acfbb336d3bdd0ee798..4874f2936079a3760b34d7dba2fa815209c2b257 100644 GIT binary patch delta 92 zcmX@Wcz{vG#WTp6fq{VugoAJWU90wFN+FD9VBlb8;4|i$sA4IOU5ayJiG_$^m3sFa UmJM=V1(!oF6^FcH-D{K#0M5T5ng9R* delta 92 zcmX@Wcz{vG#WTp6fq{VugoAII{j#hv{RX1VRJZ?NVBlb8;4}I)QN>dHriQ%E+{a46 jP#Pk|d}U&Zg-FTLoLfniA}g|L)EWF%JPx#4nKBswKo%b` diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/info/exclude b/spring-platform-config-server/src/test/resources/config-repo/git/info/exclude deleted file mode 100644 index a5196d1b..00000000 --- a/spring-platform-config-server/src/test/resources/config-repo/git/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/spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD b/spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD index ba7baee4..c6423ee9 100644 --- a/spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD +++ b/spring-platform-config-server/src/test/resources/config-repo/git/logs/HEAD @@ -1,3 +1 @@ -0000000000000000000000000000000000000000 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406744306 -0700 commit (initial): Initial -9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406744327 -0700 checkout: moving from master to raw -9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 7df4a26d5437d9d4090cd5809967f870444cde8f Dave Syer 1406744330 -0700 commit: Raw +0000000000000000000000000000000000000000 7df4a26d5437d9d4090cd5809967f870444cde8f Dave Syer 1406860717 -0700 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master b/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master index 74322838..888d21ca 100644 --- a/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master +++ b/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/master @@ -1 +1 @@ -0000000000000000000000000000000000000000 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406744306 -0700 commit (initial): Initial +0000000000000000000000000000000000000000 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406860776 -0700 branch: Created from 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw b/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw index 1316a4f1..c6423ee9 100644 --- a/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw +++ b/spring-platform-config-server/src/test/resources/config-repo/git/logs/refs/heads/raw @@ -1,2 +1 @@ -0000000000000000000000000000000000000000 9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 Dave Syer 1406744327 -0700 branch: Created from HEAD -9f01fb972bc9617e4ea59f5c8ee3ceb5ff515cd0 7df4a26d5437d9d4090cd5809967f870444cde8f Dave Syer 1406744330 -0700 commit: Raw +0000000000000000000000000000000000000000 7df4a26d5437d9d4090cd5809967f870444cde8f Dave Syer 1406860717 -0700 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/6f/6575624c9446c064fa83cc8c32d2dd5fafcca3 b/spring-platform-config-server/src/test/resources/config-repo/git/objects/6f/6575624c9446c064fa83cc8c32d2dd5fafcca3 deleted file mode 100644 index c4142794b701c9804815965fc387d954c914f2d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmV-p0G$7L0V^p=O;xZkWiT`_Ff%bxNGvGG$xKcx$;{8wtIW+|xVGj9>)dsP6SEKH z8BF@nt@7mhnsrd6Nr^>z1x5JAUjSxy50cH;>6 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/7d/f4a26d5437d9d4090cd5809967f870444cde8f b/spring-platform-config-server/src/test/resources/config-repo/git/objects/7d/f4a26d5437d9d4090cd5809967f870444cde8f deleted file mode 100644 index c579fd0693371fa60336afdf79bc513ef5da145d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmV;P0Ac@l0hNy12?8+?0R2uCX+X(ilUzW=4=d0L_BOjJc;-0ciQStP{2CY-7^>5B zZ`xVdw1rtmi6MpPfHFWN6G3qBL<4zOTq!|Nh|sGU7k)OK#aJ10awFwv69Z$&5@=xd z#A6T%Hc&AN-|bcxeZrOX<;#oSmsiK}TIc&(8$Nbar-Qa&Vgm5q=&eb{sBZgU>%rft MI^#$E0989gS3bE(GXMYp diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/87/91c22849104e1c8795747ccb678879a7c16771 b/spring-platform-config-server/src/test/resources/config-repo/git/objects/87/91c22849104e1c8795747ccb678879a7c16771 deleted file mode 100644 index 1a77413759dc159a662981fec3bee2bed799b42b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32 ocmb4GbG;8.D8GGQaWmp  NOU !rm UPzwKfs3!zGr5{vW-it-Cmi%K$6iy3NHosHdbIs4fCX}YqEr)S(Kw10X802D(d EMO_>$>;M1& diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/d6/acc4059dae71916bc26e3092f08b24e4d7acae b/spring-platform-config-server/src/test/resources/config-repo/git/objects/d6/acc4059dae71916bc26e3092f08b24e4d7acae deleted file mode 100644 index fc51db398b9047f7c2546eb9633282ab65e27c39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42 zcmV+_0M-9^0ZYosPf{?lV93l%%ePYCQcy_C2hvH2MO;ORZq#ik(> ALjV8( diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.idx b/spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.idx new file mode 100644 index 0000000000000000000000000000000000000000..2a25a7b0f49bb3301f87fdd20b4f5483efb77b94 GIT binary patch literal 1268 zcmexg;-AdGz`z8=qhRQU03*=puc7<+*;Da_(wf&?^4Gd zcTa|Hzu?!fUU5(UcBxDI{{oY_ED-+zhA9uQ*y07!i-7!UAij}eze-KC`oQCBoWK7) ipY^Zw_QYqOd2MI>an7H=ylg|9Z^`1arT4GC`3e9D%Xqc` literal 0 HcmV?d00001 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.pack b/spring-platform-config-server/src/test/resources/config-repo/git/objects/pack/pack-d4edd2290fa647beaa1255881228dc90c1d53fce.pack new file mode 100644 index 0000000000000000000000000000000000000000..a082f3c195a8a659f954b8d0d48c6eb842604f63 GIT binary patch literal 571 zcmWG=boORoU|<4b_G!EobLO7*? zfAH!c`+D;|mH zE06MQU48D@yB%|C-~2O)jXZYQI8Wr3y)6^NDOc58Jf>&Nukbh=e87KMZIF9F>ZB<;}YE6zg78P^6PoLi&B=T-ni!0YS@lxvSE-3sA9#F?^Y_2!v;LLdp7`uD0IeVdkpKVy literal 0 HcmV?d00001 diff --git a/spring-platform-config-server/src/test/resources/config-repo/git/refs/tags/foo b/spring-platform-config-server/src/test/resources/config-repo/git/refs/tags/foo new file mode 100644 index 00000000..4389eb3a --- /dev/null +++ b/spring-platform-config-server/src/test/resources/config-repo/git/refs/tags/foo @@ -0,0 +1 @@ +7df4a26d5437d9d4090cd5809967f870444cde8f