Merge "Add toString() to CherryPickCommand and ResetCommand"
This commit is contained in:
commit
59212bbb47
|
@ -330,4 +330,15 @@ private String calculateOurName(Ref headRef) {
|
||||||
String headName = Repository.shortenRefName(targetRefName);
|
String headName = Repository.shortenRefName(targetRefName);
|
||||||
return headName;
|
return headName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("nls")
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "CherryPickCommand [repo=" + repo + ",\ncommits=" + commits
|
||||||
|
+ ",\nmainlineParentNumber=" + mainlineParentNumber
|
||||||
|
+ ", noCommit=" + noCommit + ", ourCommitName=" + ourCommitName
|
||||||
|
+ ", reflogPrefix=" + reflogPrefix + ", strategy=" + strategy
|
||||||
|
+ "]";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -432,4 +432,12 @@ private void resetRevert() throws IOException {
|
||||||
repo.writeMergeCommitMsg(null);
|
repo.writeMergeCommitMsg(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("nls")
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "ResetCommand [repo=" + repo + ", ref=" + ref + ", mode=" + mode
|
||||||
|
+ ", isReflogDisabled=" + isReflogDisabled + ", filepaths="
|
||||||
|
+ filepaths + "]";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue