Merge pull request #3234 from carapace-sh/git-valid-refs

git: ActionRefCommits / ActionRefParents - prefix intenally to return valid refs

Author: rsteube

pkg/actions/tools/git/commit.go

@@ -24,7 +24,7 @@ func ActionRefCommits(ref string) carapace.Action {
 			for index, line := range lines[:len(lines)-1] {
 				vals = append(vals, fmt.Sprintf("%0"+strconv.Itoa(len(strconv.Itoa(limit-1)))+"d", index), strings.TrimSpace(line[10:]))
 			}
-			return carapace.ActionValuesDescribed(vals...).Style(styles.Git.Commit)
+			return carapace.ActionValuesDescribed(vals...).Prefix(ref + "~").Style(styles.Git.Commit)
 		})
 	}).Tag("ref commits")
 }
@@ -41,7 +41,7 @@ func ActionRefParents(ref string) carapace.Action {
 			for index, field := range strings.Fields(string(output)) {
 				vals = append(vals, strconv.Itoa(index+1), field)
 			}
-			return carapace.ActionValuesDescribed(vals...).Style(styles.Git.Commit)
+			return carapace.ActionValuesDescribed(vals...).Prefix(ref + "^").Style(styles.Git.Commit)
 		})
 	}).Tag("parent commits")
 }

pkg/actions/tools/git/ref.go

@@ -76,7 +76,7 @@ func ActionRefs(refOption RefOption) carapace.Action {
 			index := max(strings.LastIndex(c.Value, "~"), strings.LastIndex(c.Value, "^"), strings.LastIndex(c.Value, "@"))
 			switch c.Value[index] {
 			case '^':
-				return ActionRefParents(c.Value[:index]).Prefix(c.Value[:index+1])
+				return ActionRefParents(c.Value[:index])
 			case '@':
 				return carapace.Batch(
 					time.ActionDateTime(time.DateTimeOpts{}),
@@ -95,7 +95,7 @@ func ActionRefs(refOption RefOption) carapace.Action {
 				).ToA().Prefix(c.Value[:index+1] + "{")
 
 			default: // '~'
-				return ActionRefCommits(c.Value[:index]).Prefix(c.Value[:index+1])
+				return ActionRefCommits(c.Value[:index])
 			}
 		}).UidF(Uid("ref"))
 	})