creating a new git-intergration repository to fix the integration tests the right way

Author: S L

src/test/java/pl/project13/maven/git/AvailableGitTestRepo.java

@@ -60,6 +60,14 @@ public enum AvailableGitTestRepo {
   WITH_LIGHTWEIGHT_TAG_BEFORE_ANNOTATED_TAG("src/test/resources/_git_lightweight_tag_before_annotated_tag"),
   WITH_TAG_ON_DIFFERENT_BRANCH("src/test/resources/_git_with_tag_on_different_branch"),
   WITH_ONE_COMMIT_WITH_SPECIAL_CHARACTERS("src/test/resources/_git_one_commit_with_umlaut"),
+  /**
+    * <pre>
+    * b0c6d28b3b83bf7b905321bae67d9ca4c75a203f 2015-06-04 00:50:18 +0200  (HEAD, master)
+    * 0e3495783c56589213ee5f2ae8900e2dc1b776c4 2015-06-03 23:59:10 +0200  (tag: v2.0)
+    * f830b5f85cad3d33ba50d04c3d1454e1ae469057 2015-06-03 23:57:53 +0200  (tag: v1.0)
+    * </pre>
+    */
+  WITH_THREE_COMMITS_AND_TWO_TAGS_CURRENTLY_ON_COMMIT_WITHOUT_TAG("src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag"),
   MAVEN_GIT_COMMIT_ID_PLUGIN(".git");
 
   private String dir;

src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java

@@ -624,15 +624,16 @@ public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception
     // given
     mavenSandbox.withParentProject("my-plugin-project", "jar")
                 .withNoChildProject()
-                .withGitRepoInParent(AvailableGitTestRepo.MAVEN_GIT_COMMIT_ID_PLUGIN)
+                .withGitRepoInParent(AvailableGitTestRepo.WITH_THREE_COMMITS_AND_TWO_TAGS_CURRENTLY_ON_COMMIT_WITHOUT_TAG)
                 .create(CleanUp.CLEANUP_FIRST);
     MavenProject targetProject = mavenSandbox.getParentProject();
 
     setProjectToExecuteMojoIn(targetProject);
 
+    String headCommitId = "b0c6d28b3b83bf7b905321bae67d9ca4c75a203f";
     Map<String,String> gitTagMap = new HashMap<String,String>();
-    gitTagMap.put("v2.1.14", "29dc3016a3aace7149b3b50dc92573b0915ba125");
-    gitTagMap.put("v2.1.15", "b899499b3cf549238a8a30799faee47b3505b5bf");
+    gitTagMap.put("v1.0", "f830b5f85cad3d33ba50d04c3d1454e1ae469057");
+    gitTagMap.put("v2.0", "0e3495783c56589213ee5f2ae8900e2dc1b776c4");
 
     for (Map.Entry<String,String> entry : gitTagMap.entrySet()) {
       String gitDescribeMatchNeedle = entry.getKey();
@@ -654,6 +655,7 @@ public void runGitDescribeWithMatchOption(boolean useNativeGit) throws Exception
 
       assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id");
       assertThat(targetProject.getProperties().get("git.commit.id")).isNotEqualTo(commitIdOfMatchNeedle);
+      assertThat(targetProject.getProperties().get("git.commit.id")).isEqualTo(headCommitId);
     }
   }
 

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/COMMIT_EDITMSG

@@ -0,0 +1 @@
+Third line

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/config

@@ -0,0 +1,8 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+[user]
+	name = S L
+	email = s.lange@mailbox.tu-berlin.de

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/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
+}

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/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

src/test/resources/_git_three_commits_and_two_tags_currently_on_commit_without_tag/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+: