Browse Source

NLS warning cleanup

Change-Id: Ia76aa02dd330a1f88096c2b059b363aa38d653e9
tags/v3.0.0.201305080800-m7
Robin Rosenberg 11 years ago
parent
commit
a6ed390ea7

+ 3
- 5
org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java View File

@@ -155,12 +155,10 @@ public class CloneCommand extends TransportCommand<CloneCommand, Git> {
config.addURI(u);

final String dst = (bare ? Constants.R_HEADS : Constants.R_REMOTES
+ config.getName() + "/") + "*";
+ config.getName() + "/") + "*"; //$NON-NLS-1$//$NON-NLS-2$
RefSpec refSpec = new RefSpec();
refSpec = refSpec.setForceUpdate(true);
refSpec = refSpec.setSourceDestination(
Constants.R_HEADS + "*", dst); //$NON-NLS-1$ //$NON-NLS-2$

refSpec = refSpec.setSourceDestination(Constants.R_HEADS + "*", dst); //$NON-NLS-1$

config.addFetchRefSpec(refSpec);
config.update(clonedRepo.getConfig());
@@ -183,7 +181,7 @@ public class CloneCommand extends TransportCommand<CloneCommand, Git> {
private List<RefSpec> calculateRefSpecs(final String dst) {
RefSpec wcrs = new RefSpec();
wcrs = wcrs.setForceUpdate(true);
wcrs = wcrs.setSourceDestination(Constants.R_HEADS + "*", dst); //$NON-NLS-1$ //$NON-NLS-2$
wcrs = wcrs.setSourceDestination(Constants.R_HEADS + "*", dst); //$NON-NLS-1$
List<RefSpec> specs = new ArrayList<RefSpec>();
if (cloneAllBranches)
specs.add(wcrs);

+ 2
- 1
org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java View File

@@ -164,7 +164,8 @@ public class RevertCommand extends GitCommand<RevCommit> {
.newMerger(repo);
merger.setWorkingTreeIterator(new FileTreeIterator(repo));
merger.setBase(srcCommit.getTree());
merger.setCommitNames(new String[] { "BASE", ourName, revertName }); //$NON-NLS-1$ //$NON-NLS-2$
merger.setCommitNames(new String[] {
"BASE", ourName, revertName }); //$NON-NLS-1$

String shortMessage = "Revert \"" + srcCommit.getShortMessage() //$NON-NLS-1$
+ "\""; //$NON-NLS-1$

Loading…
Cancel
Save