1
0
mirror of https://github.com/openSUSE/osc.git synced 2026-03-11 03:25:57 +01:00

19 Commits

Author SHA1 Message Date
591275272c Don't upload all lfs objects when running 'git-obs pr forward --mode=sync' 2026-03-05 08:53:06 +01:00
7b677104e8 Move editing the message after the merge/sync in 'git-obs pr forward' 2026-03-05 08:53:06 +01:00
0dc1ff89c3 Introduce '--mode' argument to the 'git-obs pr forward' command 2026-03-05 08:53:06 +01:00
cf814c68cb Fix source remote so it works with --source-url in 'git-obs pr forward' 2026-03-02 13:48:19 +01:00
9c06de6a3e Mute linters complaining about unused variable in 'git-obs pr forward' 2026-03-02 10:55:04 +01:00
548b50fcd0 Remove unused 'fork_url' variable from 'git-obs pr forward' 2026-02-27 10:28:09 +01:00
bba2806992 Use Repo.clone() instead of Git.clone() in 'git-obs pr forward' to use the configured ssh key 2026-02-27 10:28:09 +01:00
7e8b448980 Handle fast-forwardable merges in 'git-obs pr forward' 2026-02-27 10:28:09 +01:00
fe389a11e9 Remove useless exception handling from 'git-obs pr forward' 2026-02-27 10:28:09 +01:00
92530a83f4 Simplify use of 'source_url' and 'lfs_remote' in 'git-obs pr forward' command 2026-02-27 10:28:09 +01:00
6d897a9fd5 Add more details to the commit message in 'git-obs pr forward' 2026-02-27 10:11:00 +01:00
6e9a92601d Simplify editing commit message in 'git-obs pr forward' 2026-02-27 10:10:11 +01:00
fb2275c855 Simplify error reporting in 'git-obs pr forward' 2026-02-27 10:10:10 +01:00
4816698039 Rename the forward branch in 'git-obs pr forward' 2026-02-27 10:08:30 +01:00
57ac14a7ae Use 'git read-tree' for cleanup after merge in 'git-obs pr forward' 2026-02-27 10:04:31 +01:00
a76ea4baca Improve .git detection in 'git-obs pr forward'
The .git entries can be both directories and files.
2026-02-25 13:37:47 +01:00
e25e3bd82a Change 'git-obs pr forward' to use makedirs(..., exist_ok=True) instead of testing for the directory presence 2026-02-25 13:36:58 +01:00
Antonello Tartamo
b3fedb6942 - Safer branching: the command now creates a dedicated, temporary branch on the user's fork (e.g., PR_factory_abc1234) for the forward-merge. This prevents conflicts with and accidental overwrites of existing development branches.
- Commit message: the pull request title and description are now used for the merge commit message. This creates a more informative and consistent git history, linking the merge commit directly to the resulting PR.
- Interactive editing: a new -e, --edit flag allows the user to open their default editor to interactively refine the PR title and description before submission.
- Unrelated history check: the command now checks for unrelated histories before merging and provides a clearer error message. A new --allow-unrelated-histories flag allows the user to override this check.
2026-02-25 12:58:55 +01:00
Antonello Tartamo
85cb0f748c Automates the workflow of forwarding sources from one branch to another (e.g., Factory to Leap/SLFO) via a Pull Request.
The command handles:
   - Automatic forking of the target repository if it doesn't exist.
   - Smart workspace detection and cloning.
   - Syncing the target branch with upstream.
   - Merging the source branch using the 'theirs' strategy.
   - Cleaning up files not present in the source branch to ensure a clean forward.
   - Optimized LFS fetching for specific incoming commits.
   - Force pushing the synchronized state to the fork and opening the Pull Request.
2026-02-25 12:58:55 +01:00