On Sat, 08 May 2021 16:12:33 +0000 "Evan McLain via GitGitGadget" <gitgitgadget@xxxxxxxxx> wrote: > Rename P4Sync.commit() to maybeCommit() and return True if the > change is committed, or False if ignored. Clear P4Sync.initialParent > only if maybeCommit() returns True. I'm not sure I'd bother doing the rename - it makes the diff more noisy than it needs to be. > There may be some other latent bugs here that I haven't fixed. In > particular, there seems to be a similar flow when detecting > branches with del self.initialParents[branch]. I wasn't sure how to > set up a repro case to expose that error, so I just fixed the bug I > understood. I don't think this issue can happen when using --detect-branches. The list of changed files get split up in splitFilesIntoBranches. Only the branches with modified files get processed, so the initialParents entry does not get removed on branches with no files to commit. This change looks good to me.
