Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support multiple -m flags for av commit command #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aviator-app merged 2 commits into from
Mar 21, 2025
Merged

Support multiple -m flags for av commit command #540

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c29faa
Support multiple -m flags for `av commit` command
draftcode Mar 19, 2025
2ca794b
Merge branch 'master' into multiple_commit_message
aviator-app[bot] Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions cmd/av/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var (
)

var commitFlags struct {
Message string
Message []string
All bool
Amend bool
Edit bool
Expand All @@ -56,13 +56,17 @@ var commitCmd = &cobra.Command{
if commitFlags.CreateBranch || commitFlags.BranchName != "" {
return errors.New("cannot create a branch and amend at the same time")
}
return amendCmd(commitFlags.Message, commitFlags.Edit, commitFlags.All)
return amendCmd(
strings.Join(commitFlags.Message, "\n\n"),
commitFlags.Edit,
commitFlags.All,
)
}

if commitFlags.CreateBranch || commitFlags.BranchName != "" {
return branchAndCommit(
commitFlags.BranchName,
commitFlags.Message,
strings.Join(commitFlags.Message, "\n\n"),
commitFlags.AllChanges,
commitFlags.All,
commitFlags.Parent,
Expand Down Expand Up @@ -119,8 +123,8 @@ func runCreate(repo *git.Repo, db meta.DB) error {
if commitFlags.All {
commitArgs = append(commitArgs, "--all")
}
if commitFlags.Message != "" {
commitArgs = append(commitArgs, "--message", commitFlags.Message)
if len(commitFlags.Message) > 0 {
commitArgs = append(commitArgs, "--message", strings.Join(commitFlags.Message, "\n\n"))
}

tx := db.WriteTx()
Expand Down Expand Up @@ -312,6 +316,7 @@ func branchAndCommit(
}

func branchNameFromMessage(message string) string {
message = strings.SplitN(strings.TrimSpace(message), "\n", 2)[0]
name := branchNameReplacedPattern.ReplaceAllLiteralString(message, " ")
name = strings.TrimSpace(name)
name = multipleSpacePattern.ReplaceAllLiteralString(name, "-")
Expand All @@ -327,7 +332,7 @@ func branchNameFromMessage(message string) string {

func init() {
commitCmd.Flags().
StringVarP(&commitFlags.Message, "message", "m", "", "the commit message")
StringArrayVarP(&commitFlags.Message, "message", "m", nil, "the commit message")
commitCmd.Flags().
BoolVarP(&commitFlags.All, "all", "a", false, "automatically stage modified and deleted files (same as git commit --all)")
commitCmd.Flags().
Expand Down