diff options
| author | Kevin Sawicki <kevin@github.com> | 2012-03-21 10:50:16 -0700 |
|---|---|---|
| committer | Chris Aniszczyk <zx@twitter.com> | 2012-03-21 14:16:14 -0700 |
| commit | b37b7e69cd3857b1c4463008a034b78870007497 (patch) | |
| tree | fa901526a945d6f5c78992feccb5f427d5b0550d /org.eclipse.jgit/resources | |
| parent | bbfa4c9b2c1df1471b48bed5a130d1d97aecb82e (diff) | |
| download | jgit-b37b7e69cd3857b1c4463008a034b78870007497.tar.gz jgit-b37b7e69cd3857b1c4463008a034b78870007497.zip | |
Add command support for dropping a stashed commit
This extracts the logic for writing to the reflog from
RefDirectory into a new ReflogWriter class. This class
creates a public API for writing reflog entries similar
to ReflogReader for reading reflog entries.
The new command supports rewriting the stash's log to remove
a configured entry followed by updating the stash ref to
the value at the bottom of the newly written log.
Change-Id: Icfcbc70e838666769a742a94196eb8dc9c7efcc7
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 2f07c97acc..0554efacd7 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -429,6 +429,9 @@ startingReadStageWithoutWrittenRequestDataPendingIsNotSupported=Starting read st stashApplyFailed=Applying stashed changes did not successfully complete stashApplyOnUnsafeRepository=Cannot apply stashed commit on a repository with state: {0} stashCommitMissingTwoParents=Stashed commit ''{0}'' does not have two parent commits +stashDropDeleteRefFailed=Deleting stash reference failed with result: {0} +stashDropFailed=Dropping stashed commit failed +stashDropMissingReflog=Stash reflog does not contain entry ''{0}'' stashFailed=Stashing local changes did not successfully complete stashResolveFailed=Reference ''{0}'' does not resolve to stashed commit statelessRPCRequiresOptionToBeEnabled=stateless RPC requires {0} to be enabled |