diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2016-10-12 08:38:30 -0400 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2016-10-12 08:38:33 -0400 |
commit | 59212bbb470746094f5dd2aeafedd6b5a6b54dc4 (patch) | |
tree | 9a5bc2b82efcc56d5dfa8bdaa197f7d5b73acdf0 | |
parent | 8f6b75f7ade43c44fcfec5a02cca50439f365f19 (diff) | |
parent | f6df5cf26ebdc5223262a11c94e7082c36656dc5 (diff) | |
download | jgit-59212bbb470746094f5dd2aeafedd6b5a6b54dc4.tar.gz jgit-59212bbb470746094f5dd2aeafedd6b5a6b54dc4.zip |
Merge "Add toString() to CherryPickCommand and ResetCommand"
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java | 11 | ||||
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java | 8 |
2 files changed, 19 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java index e82a69798f..276bf96ea2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java @@ -330,4 +330,15 @@ public class CherryPickCommand extends GitCommand<CherryPickResult> { String headName = Repository.shortenRefName(targetRefName); return headName; } + + @SuppressWarnings("nls") + @Override + public String toString() { + return "CherryPickCommand [repo=" + repo + ",\ncommits=" + commits + + ",\nmainlineParentNumber=" + mainlineParentNumber + + ", noCommit=" + noCommit + ", ourCommitName=" + ourCommitName + + ", reflogPrefix=" + reflogPrefix + ", strategy=" + strategy + + "]"; + } + } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java index 3ceff843a5..106988d4d4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java @@ -432,4 +432,12 @@ public class ResetCommand extends GitCommand<Ref> { repo.writeMergeCommitMsg(null); } + @SuppressWarnings("nls") + @Override + public String toString() { + return "ResetCommand [repo=" + repo + ", ref=" + ref + ", mode=" + mode + + ", isReflogDisabled=" + isReflogDisabled + ", filepaths=" + + filepaths + "]"; + } + } |