Merge pull request cli#2025 from mmontes11/pr-create-use-git-branch-show-current

mislav · web-flow · commit 2eab4a940f82 · 2020-10-06T14:31:34.000+02:00
Avoding --short option in git symbolic-ref for getting the current branch
diff --git a/git/git.go b/git/git.go
@@ -56,12 +56,12 @@ func ShowRefs(ref ...string) ([]Ref, error) {
 
 // CurrentBranch reads the checked-out branch for the git repository
 func CurrentBranch() (string, error) {
-	refCmd := GitCommand("symbolic-ref", "--quiet", "--short", "HEAD")
+	refCmd := GitCommand("symbolic-ref", "--quiet", "HEAD")
 
 	output, err := run.PrepareCmd(refCmd).Output()
 	if err == nil {
 		// Found the branch name
-		return firstLine(output), nil
+		return getBranchShortName(output), nil
 	}
 
 	var cmdErr *run.CmdError
@@ -291,3 +291,8 @@ func firstLine(output []byte) string {
 	}
 	return string(output)
 }
+
+func getBranchShortName(output []byte) string {
+	branch := firstLine(output)
+	return strings.TrimPrefix(branch, "refs/heads/")
+}
diff --git a/git/git_test.go b/git/git_test.go
@@ -39,22 +39,40 @@ func Test_UncommittedChangeCount(t *testing.T) {
 }
 
 func Test_CurrentBranch(t *testing.T) {
-	cs, teardown := test.InitCmdStubber()
-	defer teardown()
-
-	expected := "branch-name"
-
-	cs.Stub(expected)
-
-	result, err := CurrentBranch()
-	if err != nil {
-		t.Errorf("got unexpected error: %w", err)
+	type c struct {
+		Stub     string
+		Expected string
 	}
-	if len(cs.Calls) != 1 {
-		t.Errorf("expected 1 git call, saw %d", len(cs.Calls))
+	cases := []c{
+		{
+			Stub:     "branch-name\n",
+			Expected: "branch-name",
+		},
+		{
+			Stub:     "refs/heads/branch-name\n",
+			Expected: "branch-name",
+		},
+		{
+			Stub:     "refs/heads/branch\u00A0with\u00A0non\u00A0breaking\u00A0space\n",
+			Expected: "branch\u00A0with\u00A0non\u00A0breaking\u00A0space",
+		},
 	}
-	if result != expected {
-		t.Errorf("unexpected branch name: %s instead of %s", result, expected)
+
+	for _, v := range cases {
+		cs, teardown := test.InitCmdStubber()
+		cs.Stub(v.Stub)
+
+		result, err := CurrentBranch()
+		if err != nil {
+			t.Errorf("got unexpected error: %w", err)
+		}
+		if len(cs.Calls) != 1 {
+			t.Errorf("expected 1 git call, saw %d", len(cs.Calls))
+		}
+		if result != v.Expected {
+			t.Errorf("unexpected branch name: %s instead of %s", result, v.Expected)
+		}
+		teardown()
 	}
 }
 
