Skip to content

Add RestoreStaged to Worktree that mimics the behaviour of git restore --staged <file>... #343

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

Closed
wants to merge 8 commits into from
+435 −9
Closed

Add RestoreStaged to Worktree that mimics the behaviour of git restore --staged <file>... #343

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
71937cc
git: worktree, add RestoreStaged which works like the "git restore --…
Jun 11, 2021
deda446
git: worktree, add restore to the _examples
Jun 11, 2021
de9cbf6
Add missing info line for the example
Jun 11, 2021
58302ee
git: worktree, Convert from RestoreStaged(files ...string) to Restore…
Jul 5, 2021
3ce029e
git: worktree, Move ErrNoRestorePaths to be isolated like other examp…
Jul 5, 2021
a1221f4
git: worktree, Remove the -- from the ErrRestoreWorktreeeOnlyNotSuppo…
Jul 14, 2021
eac1e38
git: worktree, Update the documentation to be more clear and follow t…
Jul 14, 2021
68f2675
git: worktree, When comparing against the Files option in resetWorktr…
Nov 5, 2021
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
Prev Previous commit
Next Next commit
git: worktree, Update the documentation to be more clear and follow t… 
…he documentation standards
  • Loading branch information
Ben Talbot committed Jul 14, 2021
commit eac1e381cdd4769303231f06218a7eb1610f8b76
12 changes: 11 additions & 1 deletion worktree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,17 @@ func (w *Worktree) setHEADToBranch(branch plumbing.ReferenceName, commit plumbin
return w.r.Storer.SetReference(head)
}

// unstages a set of files -- equivalent to "git restore --staged <file>..."
// Restore specified files in the working tree or stage with contents from
// a restore source. If a path is tracked but does not exist in the restore,
// source, it will be removed to match the source.
//
// If Staged and Worktree are true, then the restore source will be the index.
// If only Staged is true, then the restore source will be HEAD.
// If only Worktree is true or neither Staged nor Worktree are true, will
// result in ErrRestoreWorktreeeOnlyNotSupported because restoring the working
// tree while leaving the stage untouched is not currently supported
//
// Restore with no files specified will return ErrNoRestorePaths
func (w *Worktree) Restore(o *RestoreOptions) error {
if err := o.Validate(); err != nil {
return err
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy