porcelain status

Author: linkdata

internal/gitsemver/gitter.go

@@ -386,7 +386,7 @@ func (dg DefaultGitter) DeleteRemoteTag(repo, tag string) (err error) {
 
 func (dg DefaultGitter) CleanStatus(repo string) (yes bool, err error) {
 	var b []byte
-	if b, err = dg.Exec("-C", repo, "status", "--untracked-files=no", "--porcelain"); err == nil {
+	if b, err = dg.Exec("-C", repo, "status", "--porcelain"); err == nil {
 		yes = len(b) == 0
 	}
 	return

internal/gitsemver/gitter_test.go

@@ -578,6 +578,29 @@ func Test_DefaultGitter_CleanStatus(t *testing.T) {
 	}
 }
 
+func Test_DefaultGitter_CleanStatus_DetectsUntrackedFiles(t *testing.T) {
+	repo := t.TempDir()
+	runGit(t, repo, nil, "init", "-q")
+	runGit(t, repo, nil, "config", "user.email", "test@example.com")
+	runGit(t, repo, nil, "config", "user.name", "Test")
+	commitAt(t, repo, "a.txt", "a\n", "c1", "2020-01-01T00:00:00Z")
+	if err := os.WriteFile(filepath.Join(repo, "untracked.txt"), []byte("x\n"), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	dg, err := gitsemver.NewDefaultGitter("git", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	clean, err := dg.CleanStatus(repo)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if clean {
+		t.Fatal("expected untracked file to make status dirty")
+	}
+}
+
 func Test_DefaultGitter_ExecPreservesErrGitExecInDebugMode(t *testing.T) {
 	var buf bytes.Buffer
 	dg, err := gitsemver.NewDefaultGitter("git", &buf)

main_test.go

@@ -544,6 +544,81 @@ func TestMainFnIncPatchRefusesDirtyTree(t *testing.T) {
 	}
 }
 
+func TestMainFnIncPatchRefusesUntrackedFile(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, "untracked.txt"), []byte("new\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 with untracked file")
+	}
+
+	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()
@@ -584,6 +659,8 @@ func TestMainFnIncPatchOverwritesExistingOutputFile(t *testing.T) {
 	if err := os.WriteFile(filepath.Join(work, "out.txt"), []byte("old\n"), 0o644); err != nil {
 		t.Fatal(err)
 	}
+	runGit(t, work, "add", "out.txt")
+	runGit(t, work, "commit", "-q", "-m", "add out")
 
 	if err := os.Chdir(work); err != nil {
 		t.Fatal(err)