From 3f56245f179352790620c92be996c165528a4b38 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 4 May 2018 09:02:10 +0200 Subject: dim: store Link: in MERGE_MSG in apply-pull This way there's no need for a dim apply-pull-continue, plain old git commit is enough. Aside: We might want to do the same trick for dim apply-branch, but git am is a bit harder to script. v2: Drop cat, use shell redirects to appeas shellcheck. Acked-by: Jani Nikula Cc: Dave Airlie Cc: Jani Nikula Signed-off-by: Daniel Vetter --- dim | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dim b/dim index cecd80eb7161..6b684ba5308c 100755 --- a/dim +++ b/dim @@ -519,6 +519,15 @@ function rr_cache_dir fi } +function git_dir +{ + if [ -d $PWD/.git ] ; then + echo $PWD/.git + else + cut -d ' ' -f 2 < $PWD/.git + fi +} + function pull_rerere_cache { cd $DIM_PREFIX/drm-rerere/ @@ -905,7 +914,7 @@ function dim_apply_branch function dim_apply_pull { - local branch file message_id pull_branch rv + local branch file message_id pull_branch rv merge_msg_file branch=${1:?$usage} file=$(mktemp) @@ -935,6 +944,12 @@ function dim_apply_pull if ! $DRY git pull $pull_branch ; then if ! check_conflicts "$pull_branch" ; then echoerr "Please resolve and then commit normally using git" + + merge_msg_file="$(git_dir)/MERGE_MSG" + if [ -n "$message_id" ]; then + echo "Link: https://patchwork.freedesktop.org/patch/msgid/$message_id" >> $merge_msg_file + fi + return 1 else git add -u -- cgit v1.2.3