diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-08-24 15:50:36 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-08-25 17:07:12 -0700 |
| commit | c44495fa2f6ac0b06dc974d1b6626cf52380ea2c (patch) | |
| tree | 1d5a88e6406ebfc4ee5c792743bb1d290afa8810 /org.eclipse.jgit/resources | |
| parent | 127a5f95e1d20b6dd84f4d2ce2a2fb435b36fb56 (diff) | |
| download | jgit-c44495fa2f6ac0b06dc974d1b6626cf52380ea2c.tar.gz jgit-c44495fa2f6ac0b06dc974d1b6626cf52380ea2c.zip | |
Complete an abbreviation when formatting a patch
If we are given a DiffEntry header that already has abbreviated
ObjectIds on it, we may still be able to resolve those locally and
output the difference. Try to do that through the new resolve API
on ObjectReader.
Change-Id: I0766aa5444b7b8fff73620290f8c9f54adc0be96
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index 58adf332d3..b6cfd84b1e 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -11,6 +11,7 @@ advertisementCameBefore=advertisement of {0}^{} came before {1} advertisementOfCameBefore=advertisement of {0}^{} came before {1} amazonS3ActionFailed={0} of '{1}' failed: {2} {3} amazonS3ActionFailedGivingUp={0} of '{1}' failed: Giving up after {2} attempts. +ambiguousObjectAbbreviation=Object abbreviation {0} is ambiguous anExceptionOccurredWhileTryingToAddTheIdOfHEAD=An exception occurred while trying to add the Id of HEAD anSSHSessionHasBeenAlreadyCreated=An SSH session has been already created atLeastOnePathIsRequired=At least one path is required. |