diff options
| author | Kevin Sawicki <kevin@github.com> | 2011-12-16 17:05:42 -0800 |
|---|---|---|
| committer | Kevin Sawicki <kevin@github.com> | 2011-12-16 17:05:47 -0800 |
| commit | dc4c06e7acba79044fc3850a61971fec615632e5 (patch) | |
| tree | 932854c1dd67fbd6060e6ba0c182cf8c1382814d /org.eclipse.jgit/resources | |
| parent | 29fc8fffc19f3a8e92c795294ee59d24052c3443 (diff) | |
| download | jgit-dc4c06e7acba79044fc3850a61971fec615632e5.tar.gz jgit-dc4c06e7acba79044fc3850a61971fec615632e5.zip | |
Support resolving integer-based reflog revisions
Revision strings such as 'master@{0}' can now be resolved
by Repository.resolve by reading the reflog for the ref and
returning the commit for the entry number specified.
This still throws an exception for cases not supported
such as 'master@{yesterday}'.
Change-Id: I6162777d6510e083565a77cac4545cda5a9aefb3
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index fc32069999..5bb2800db0 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -249,6 +249,7 @@ invalidObject=Invalid {0} {1}:{2} invalidOldIdSent=invalid old id sent invalidPacketLineHeader=Invalid packet line header: {0} invalidPath=Invalid path: {0} +invalidReflogRevision=Invalid reflog revision: {0} invalidRefName=Invalid ref name: {0} invalidRemote=Invalid remote: {0} invalidStageForPath=Invalid stage {0} for path {1} @@ -366,7 +367,7 @@ receivingObjects=Receiving objects refAlreadyExists=Ref {0} already exists refNotResolved=Ref {0} can not be resolved refUpdateReturnCodeWas=RefUpdate return code was: {0} -reflogsNotYetSupportedByRevisionParser=reflogs not yet supported by revision parser +reflogEntryNotFound=Entry {0} not found in reflog for ''{1}'', only {2} entries exist remoteConfigHasNoURIAssociated=Remote config "{0}" has no URIs associated remoteDoesNotHaveSpec=Remote does not have {0} available for fetch. remoteDoesNotSupportSmartHTTPPush=remote does not support smart HTTP push |