Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(git): add debug #9683

Merged
merged 2 commits into from
Apr 25, 2021
Merged

fix(git): add debug #9683

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a220b55
fix(git): add debug
viceice Apr 22, 2021
0c9c1d7
Merge branch 'main' into fix/git-debug
JamieMagee Apr 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/util/git/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,13 +450,19 @@ export function getBranchList(): string[] {
export async function isBranchStale(branchName: string): Promise<boolean> {
await syncBranch(branchName);
try {
const { currentBranchSha, currentBranch } = config;
const branches = await git.branch([
'--remotes',
'--verbose',
'--contains',
config.currentBranchSha,
]);
return !branches.all.map(localName).includes(branchName);
const isStale = !branches.all.map(localName).includes(branchName);
logger.debug(
{ isStale, branches, currentBranch, currentBranchSha },
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will log the full non-stale branch list once per-branch which calls isStale, right?

i.e. if there are 20 branches and 10 are non-stale then we'd get the same list of 10 branches logged 20 times during a run?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, but sometimes there must be something wrong. i don't now yet what, so i can reduce to only log branches.all but the branches.branches value can be interesting too, when the issue occure. 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe currentbranchSha is wrong because of a silent git error happened on an other branch before?

`IsBranchStale=${isStale}`
);
return isStale;
} catch (err) /* istanbul ignore next */ {
checkForPlatformFailure(err);
throw err;
Expand Down