Skip to content

Commit

Permalink
Better logging for cherry-pick
Browse files Browse the repository at this point in the history
  • Loading branch information
novalis committed Aug 18, 2021
1 parent 4c6a742 commit 87920e1
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions node/lib/util/cherry_pick_util.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,13 @@ exports.changeSubmodules = co.wrap(function *(repo,
for (let name in submodules) {
const sub = submodules[name];
if (null === sub) {
console.log(`Deleting ${name}`);
changes[name] = null;
delete urls[name];
yield rmrf(name);
}
else if (opener.isOpen(name)) {
console.log(`Fast-forwarding open submodule ${name}`);
const subRepo =
yield opener.getSubrepo(name,
Open.SUB_OPEN_OPTION.FORCE_OPEN);
Expand All @@ -129,6 +131,7 @@ exports.changeSubmodules = co.wrap(function *(repo,
yield GitUtil.setHeadHard(subRepo, commit);
yield index.addByPath(name);
} else {
console.log(`Fast-forwarding closed submodule ${name}`);
changes[name] = new TreeUtil.Change(
NodeGit.Oid.fromString(sub.sha),
NodeGit.TreeEntry.FILEMODE.COMMIT);
Expand Down

0 comments on commit 87920e1

Please sign in to comment.