Skip to content

git: restore - support --source #2562

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

Draft
rsteube wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

git: restore - support --source #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion completers/git_completer/cmd/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func actionDiffArgs(cmd *cobra.Command) carapace.Action {
var action carapace.Action
if cmd.Flag("cached").Changed {
if len(expanded) > 0 {
action = git.ActionCachedDiffs(expanded[0])
action = git.ActionCachedRefDiffs(expanded[0])
}
} else {
action = git.ActionRefDiffs(expanded...)
Expand Down
7 changes: 7 additions & 0 deletions completers/git_completer/cmd/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,15 @@ func init() {
carapace.Gen(restoreCmd).PositionalAnyCompletion(
carapace.ActionCallback(func(c carapace.Context) carapace.Action {
if restoreCmd.Flag("staged").Changed {
if f := restoreCmd.Flag("source"); f.Changed {
return git.ActionCachedRefDiffs(f.Value.String())
}
return git.ActionChanges(git.ChangeOpts{Staged: true}).FilterArgs()
}

if f := restoreCmd.Flag("source"); f.Changed {
return git.ActionRefDiffs(f.Value.String())
}
return git.ActionChanges(git.ChangeOpts{Unstaged: true}).FilterArgs()
}),
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/actions/tools/git/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func ActionRefDiffs(refs ...string) carapace.Action {
}

// ActionCachedDiffs completes changes between stage and given ref
func ActionCachedDiffs(ref string) carapace.Action {
func ActionCachedRefDiffs(ref string) carapace.Action {
return actionRefDiffs(true, ref)
}

Expand Down