Browse Source

Branch: Fix variable hiding warning

The Branch class has a member named 'branch', which was being
hidden by the local variable of the same name used in a for-loop.

Change-Id: I334092010a9c80686fb79713852d4bfa166ce12f
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
stable-4.2
David Pursehouse 9 years ago
parent
commit
2fab7f20a7
  1. 16
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java

16
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java

@ -310,24 +310,24 @@ class Branch extends TextBuiltin {
throws IOException { throws IOException {
String current = db.getBranch(); String current = db.getBranch();
ObjectId head = db.resolve(Constants.HEAD); ObjectId head = db.resolve(Constants.HEAD);
for (String branch : branches) { for (String b : branches) {
if (branch.equals(current)) { if (b.equals(current)) {
throw die(MessageFormat.format(CLIText.get().cannotDeleteTheBranchWhichYouAreCurrentlyOn, branch)); throw die(MessageFormat.format(CLIText.get().cannotDeleteTheBranchWhichYouAreCurrentlyOn, b));
} }
RefUpdate update = db.updateRef((remote ? Constants.R_REMOTES RefUpdate update = db.updateRef((remote ? Constants.R_REMOTES
: Constants.R_HEADS) : Constants.R_HEADS)
+ branch); + b);
update.setNewObjectId(head); update.setNewObjectId(head);
update.setForceUpdate(force || remote); update.setForceUpdate(force || remote);
Result result = update.delete(); Result result = update.delete();
if (result == Result.REJECTED) { if (result == Result.REJECTED) {
throw die(MessageFormat.format(CLIText.get().branchIsNotAnAncestorOfYourCurrentHEAD, branch)); throw die(MessageFormat.format(CLIText.get().branchIsNotAnAncestorOfYourCurrentHEAD, b));
} else if (result == Result.NEW) } else if (result == Result.NEW)
throw die(MessageFormat.format(CLIText.get().branchNotFound, branch)); throw die(MessageFormat.format(CLIText.get().branchNotFound, b));
if (remote) if (remote)
outw.println(MessageFormat.format(CLIText.get().deletedRemoteBranch, branch)); outw.println(MessageFormat.format(CLIText.get().deletedRemoteBranch, b));
else if (verbose) else if (verbose)
outw.println(MessageFormat.format(CLIText.get().deletedBranch, branch)); outw.println(MessageFormat.format(CLIText.get().deletedBranch, b));
} }
} }
} }

Loading…
Cancel
Save