]> git.ozlabs.org Git - next-scripts/commitdiff
do_merge: add duplicates to the log file
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Jan 2023 22:00:57 +0000 (09:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Jan 2023 22:00:57 +0000 (09:00 +1100)
do_merge

index 68ba9d793bbc4b6567564d451df57ba75fd9a40c..b678993581fe17693b91a7ca4cd5741645aedfd5 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -90,7 +90,7 @@ for h in $heads; do
                done 7<"../pre-merge/$tree"
        fi
        log Merging "$h" "($hlog)"
-       check_dups "$tree" HEAD "$h"
+       check_dups "$tree" HEAD "$h" | tee -a "$LOG_FILE"
        msg=$(printf "Merge branch '%s' of %s" "${h#*/}" "$(get_url "$tree")")
        if ! execute git merge -m "$msg" "$h"; then
                echo Merge failed 1>&2