3
5
Fork
You've already forked xut
3

feat: Pull from specific branch + #63

Open
zenobit wants to merge 10 commits from oSoWoSo/xut:remote-custom-branch into master
pull from: oSoWoSo/xut:remote-custom-branch
merge into: mobinmob:master
mobinmob:master
mobinmob:template_list_cache
mobinmob:find_repodir_caching
mobinmob:unique_repodir_names
mobinmob:mobinmob-patch-1
mobinmob:yet_another_touch
mobinmob:mdocs
mobinmob:moar_fixes
mobinmob:seperate_build_preparation
mobinmob:root_check
mobinmob:ls_to_list_dirs
mobinmob:CONF_WORKDIR.override
mobinmob:safety_portability_fixes
mobinmob:fix_updates
mobinmob:fixes_and_find
mobinmob:get_key_from_template
mobinmob:v.0.3
mobinmob:v.0.2
mobinmob:dev
mobinmob:manyrepos
Contributor
Copy link
No description provided.
zenobit changed title from (削除) feat: Pull from custom branch (削除ここまで) to feat: Pull from custom branch + 2025年12月29日 10:29:01 +01:00
zenobit force-pushed remote-custom-branch from 9b482b741f to bac9ecdc89 2025年12月29日 10:31:36 +01:00 Compare
zenobit changed title from (削除) feat: Pull from custom branch + (削除ここまで) to feat: Pull from specific branch + 2025年12月29日 10:31:51 +01:00

I really like the changes that enable specific branches. I believe it is the right thing to do - actually I would prefer it to depend on gh conventions, but that is another issue...
I do not have an issue with formating changes if something is readable, it is ok. I hope I will have automatic formating one day (maybe in ci, maybe not). I used shfmt with minimal conf in the past.

There is an problem with CONF_WORKDIR. It is a user-facing/ user interface change. In other words, by changing it you change the way a user interacts witht the script. If you believe that is the right choice, you also need to:

  • document the change and the deprecation in the documentation/manpage,

  • be able to use the old variable name with a deprecation notice that it will work until version 0.5.0 (just an example).

I really like the changes that enable specific branches. I believe it is the right thing to do - actually I would prefer it to depend on gh conventions, but that is another issue... I do not have an issue with formating changes if something is readable, it is ok. I hope I will have automatic formating one day (maybe in ci, maybe not). I used shfmt with minimal conf in the past. There is an problem with CONF_WORKDIR. It is a user-facing/ user interface change. In other words, by changing it you change the way a user interacts witht the script. If you believe that is the right choice, you also need to: - document the change and the deprecation in the documentation/manpage, - be able to use the old variable name with a deprecation notice that it will work until version 0.5.0 (just an example).
zenobit force-pushed remote-custom-branch from bac9ecdc89 to e1569e7c62 2026年01月15日 22:11:18 +01:00 Compare
Author
Contributor
Copy link

There is an problem with CONF_WORKDIR...

solved

> There is an problem with CONF_WORKDIR... solved

Thanks!
Please give me a few days - I am trying to find a way to stop hitting the disk too much and reuse (enhanced) template lists as the source to decide merges. Some unofficial repos are plainly painfull to work with with the code as-is...

Thanks! Please give me a few days - I am trying to find a way to stop hitting the disk too much and reuse (enhanced) template lists as the source to decide merges. Some unofficial repos are plainly painfull to work with with the code as-is...

@mobinmob wrote in #63 (comment):

Thanks! Please give me a few days - I am trying to find a way to stop hitting the disk too much and reuse (enhanced) template lists as the source to decide merges. Some unofficial repos are plainly painfull to work with with the code as-is...

74f02dcfe3

The work so far...

@mobinmob wrote in https://codeberg.org/mobinmob/xut/pulls/63#issuecomment-9905214: > Thanks! Please give me a few days - I am trying to find a way to stop hitting the disk too much and reuse (enhanced) template lists as the source to decide merges. Some unofficial repos are plainly painfull to work with with the code as-is... https://codeberg.org/mobinmob/xut/commit/74f02dcfe3af15ae8a84696346066ce8da7516a0 The work so far...
This pull request has changes conflicting with the target branch.
  • xut
  • xut.1
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u remote-custom-branch:oSoWoSo-remote-custom-branch
git switch oSoWoSo-remote-custom-branch

Merge

Merge the changes and update on Forgejo.
git switch master
git merge --no-ff oSoWoSo-remote-custom-branch
git switch oSoWoSo-remote-custom-branch
git rebase master
git switch master
git merge --ff-only oSoWoSo-remote-custom-branch
git switch oSoWoSo-remote-custom-branch
git rebase master
git switch master
git merge --no-ff oSoWoSo-remote-custom-branch
git switch master
git merge --squash oSoWoSo-remote-custom-branch
git switch master
git merge --ff-only oSoWoSo-remote-custom-branch
git switch master
git merge oSoWoSo-remote-custom-branch
git push origin master
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
mobinmob/xut!63
Reference in a new issue
mobinmob/xut
No description provided.
Delete branch "oSoWoSo/xut:remote-custom-branch"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?