require clean repo to incpatch

Author: linkdata

main.go

@@ -108,9 +108,16 @@ func mainfn() int {
 				var vi gitsemver.VersionInfo
 				if vi, err = vs.GetVersion(repoDir); err == nil {
 					if *flagIncPatch {
-						createTag = vi.IncPatch()
-						if testMode {
-							createTag = ""
+						var clean bool
+						if clean, err = vs.Git.CleanStatus(repoDir); err == nil {
+							if !clean {
+								err = errors.New("cannot use -incpatch with uncommitted changes")
+							} else {
+								createTag = vi.IncPatch()
+								if testMode {
+									createTag = ""
+								}
+							}
 						}
 					}
 					content := vi.Version()

main_test.go

@@ -337,6 +337,81 @@ func TestMainFnIncPatchDoesNotWriteOutputOnPushError(t *testing.T) {
 	}
 }
 
+func TestMainFnIncPatchRefusesDirtyTree(t *testing.T) {
+	flag.Parse()
+	oldWD, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer func() { _ = os.Chdir(oldWD) }()
+
+	origGit, origOut, origName := *flagGit, *flagOut, *flagName
+	origDebug, origGoPackage := *flagDebug, *flagGoPackage
+	origNoFetch, origNoNewline := *flagNoFetch, *flagNoNewline
+	origIncPatch, origBranch := *flagIncPatch, *flagBranch
+	origTestMode := testMode
+	defer func() {
+		*flagGit, *flagOut, *flagName = origGit, origOut, origName
+		*flagDebug, *flagGoPackage = origDebug, origGoPackage
+		*flagNoFetch, *flagNoNewline = origNoFetch, origNoNewline
+		*flagIncPatch, *flagBranch = origIncPatch, origBranch
+		testMode = origTestMode
+	}()
+
+	base := t.TempDir()
+	origin := filepath.Join(base, "origin.git")
+	work := filepath.Join(base, "work")
+
+	runGit(t, "", "init", "--bare", "-q", origin)
+	runGit(t, "", "clone", "-q", origin, work)
+	runGit(t, work, "config", "user.email", "test@example.com")
+	runGit(t, work, "config", "user.name", "Test")
+	if err := os.WriteFile(filepath.Join(work, "a.txt"), []byte("a\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+	runGit(t, work, "add", "a.txt")
+	runGit(t, work, "commit", "-q", "-m", "c1")
+	runGit(t, work, "tag", "v1.0.0")
+	runGit(t, work, "push", "-q", "origin", "HEAD", "--tags")
+
+	if err := os.WriteFile(filepath.Join(work, "a.txt"), []byte("a\ndirty\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := os.Chdir(work); err != nil {
+		t.Fatal(err)
+	}
+
+	*flagGit = "git"
+	*flagOut = "out.txt"
+	*flagName = ""
+	*flagDebug = false
+	*flagGoPackage = false
+	*flagNoFetch = true
+	*flagNoNewline = false
+	*flagIncPatch = true
+	*flagBranch = false
+	testMode = false
+
+	if code := mainfn(); code == 0 {
+		t.Fatal("mainfn unexpectedly succeeded on dirty tree")
+	}
+
+	if _, err := os.Stat(filepath.Join(work, "out.txt")); err == nil {
+		t.Fatal("unexpected output file out.txt")
+	} else if !os.IsNotExist(err) {
+		t.Fatal(err)
+	}
+	localTags := runGit(t, work, "tag", "--list")
+	if strings.Contains(localTags, "v1.0.1") {
+		t.Fatalf("unexpected local tag v1.0.1: %q", localTags)
+	}
+	remoteTags := runGit(t, work, "ls-remote", "--tags", "origin")
+	if strings.Contains(remoteTags, "refs/tags/v1.0.1") {
+		t.Fatalf("unexpected remote tag v1.0.1: %q", remoteTags)
+	}
+}
+
 func TestMainFnIncPatchOverwritesExistingOutputFile(t *testing.T) {
 	flag.Parse()
 	oldWD, err := os.Getwd()