Browse Source

Fix missing braces in Branch.run()

Change-Id: Ie8a757552846d2454017a95e20dc14fdf6a93982
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-5.4
Matthias Sohn 6 years ago
parent
commit
be2ae1e103
  1. 15
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Branch.java

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

@ -207,22 +207,27 @@ class Branch extends TextBuiltin {
} else {
src = branch;
final Ref old = db.findRef(src);
if (old == null)
if (old == null) {
throw die(MessageFormat.format(CLIText.get().doesNotExist, src));
if (!old.getName().startsWith(Constants.R_HEADS))
}
if (!old.getName().startsWith(Constants.R_HEADS)) {
throw die(MessageFormat.format(CLIText.get().notABranch, src));
}
src = old.getName();
dst = otherBranch;
}
if (!dst.startsWith(Constants.R_HEADS))
if (!dst.startsWith(Constants.R_HEADS)) {
dst = Constants.R_HEADS + dst;
if (!Repository.isValidRefName(dst))
}
if (!Repository.isValidRefName(dst)) {
throw die(MessageFormat.format(CLIText.get().notAValidRefName, dst));
}
RefRename r = db.renameRef(src, dst);
if (r.rename() != Result.RENAMED)
if (r.rename() != Result.RENAMED) {
throw die(MessageFormat.format(CLIText.get().cannotBeRenamed, src));
}
} else if (createForce || branch != null) {
String newHead = branch;

Loading…
Cancel
Save