dim: Fixes/polish for cherry-pick
PATCH 1/1 dim: Fixes/polish for cherry-pick
- Subcommands without subshell is nice, except it can break worktree
setups: Branch specific commands want to run in the worktree, general commands like dim_cite switch back to the main directory. Tears ensue (or well, some cryptic complaint from git that cherry-pick --abort failed because there's no cherry-pick in progress). Run it in a subshell.
Not sure we need a general fix to make this more robust.
- Document commands a bit better.
Cc Jani Nikula <[email protected]>
Acked-by Jani Nikula <[email protected]>
Signed-off-by Daniel Vetter <[email protected]>
--- dim | 2 +- dim.rst | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
dim +1 -1
@@ -997,7 +997,7 @@ function dim_cherry_pick_branch commit_list_references $commit if ! git cherry-pick -x -s $commit; then echo "FAILED: $(dim_cite $commit)" - dim_cite $commit >> $fail_log + (dim_cite $commit) >> $fail_log git cherry-pick --abort fi done
dim.rst +3 -1
@@ -323,7 +323,9 @@ cherry-pick-next-fixes ---------------------- Look for non-upstreamed fixes (commits tagged Cc: [email protected] or Cc: [email protected]) in drm-intel-next-queued, and try to -cherry-pick them to drm-intel-fixes or drm-intel-next-fixes. +cherry-pick them to drm-intel-fixes or drm-intel-next-fixes. These commands use +dim cherry-pick internally to make sure bugfixes for fixes are cherry-picked +too. pull-request *branch* *upstream* --------------------------------
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx