- 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 <jani.nikula@xxxxxxxxxxxxxxx> Acked-by: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> --- dim | 2 +- dim.rst | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dim b/dim index 267dbc0313b1..6a87f99e9c2d 100755 --- a/dim +++ b/dim @@ -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 diff --git a/dim.rst b/dim.rst index 10572f139130..4d3eaa846e17 100644 --- a/dim.rst +++ b/dim.rst @@ -323,7 +323,9 @@ cherry-pick-next-fixes ---------------------- Look for non-upstreamed fixes (commits tagged Cc: stable@xxxxxxxxxxxxxxx or Cc: drm-intel-fixes@xxxxxxxxxxxxxxxxxxxxx) 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* -------------------------------- -- 2.11.0 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
