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.

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

Add parent commits to build details #312

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from

Conversation

bjornoleh
Copy link
Contributor

List commit ID including parent commits as a separate line in build details under Settings

Resolves #311

List commit ID including parent commits as a separate line in build details under Settings
@bjornoleh bjornoleh added the enhancement New feature or request label Jun 16, 2024
@bjornoleh bjornoleh self-assigned this Jun 16, 2024
@bjornoleh
Copy link
Contributor Author

bjornoleh commented Jun 16, 2024

Example of display of one parent commit in addition to the latest commit:

Parent1: 3be872c is the tip of alpha

@bjornoleh
Copy link
Contributor Author

bjornoleh commented Jun 16, 2024

Example with two parent commits:

Parent1: 032c6e2 is the previous commit before merging alpha into private branch
Parent2: 3be872c is the tip of alpha

@Sjoerd-Bo3 Sjoerd-Bo3 deleted the branch nightscout:dev July 2, 2024 14:00
@Sjoerd-Bo3 Sjoerd-Bo3 closed this Jul 2, 2024
@Sjoerd-Bo3 Sjoerd-Bo3 reopened this Jul 2, 2024
@Sjoerd-Bo3 Sjoerd-Bo3 changed the base branch from alpha to dev July 2, 2024 14:03
@marionbarker
Copy link
Contributor

Summary

  • Success - this does what it is designed to do
  • Caveats:
    • I didn't do a test case where 2 parents show up
    • Others need to decide if this change is preferred

Tests:

The full list of commits entered into parent_commits (test branch) are at the bottom of this comment.
For each successive test case below, report the strings shown on the Settings page:

  • Build straight dev branch
Branch: dev 9672da25
  • Create new branch, parent_commits, from dev and apply the patch, do not commit the changes
Branch: parent_commits
Commit: 9672da25, Parent1: bd566014
  • Commit the changes to parent_commits branch
Branch: parent_commits
Commit: 2c21e528, Parent1: 9672da25
  • Add another commit to parent_commits
Branch: parent_commits
Commit: b6f1b677, Parent1: 2c21e528
  • Add another commit to parent_commits
Branch: parent_commits
Commit: 5fb31d49, Parent1: b6f1b677
  • Reverse PR-312 and commit that change
Branch: parent_commits f704e089

Commit history for parent_commits at end of test:

  • Commit the changes, report git log --oneline -6
f704e089 (HEAD -> parent_commits) reverse Trio PR 312
5fb31d49 comment line added to Config.xcconfig to modify commit history again
b6f1b677 comment line added to Config.xcconfig to modify commit history
2c21e528 apply Trio PR 312 to commit 9672da25 of dev
9672da25 (origin/dev, dev)  Add Trio-Specific App Group for Isolated Data Storage (#314)
bd566014 Merge pull request #337 from polscm32/decimalTextfield

@marionbarker marionbarker self-requested a review July 20, 2024 15:51
Merge nightscout/Trio dev into parent_commits
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[feature request] - Add parent commit IDs to build details under Settings
3 participants