]> git.ozlabs.org Git - next-scripts/commitdiff
do_merge: print the correct head of the scsi-post-merge tree
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 18 Dec 2012 03:40:47 +0000 (14:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 18 Dec 2012 03:40:47 +0000 (14:40 +1100)
do_merge

index 63d90cc10b8a2fcad04b4401326818c3d7c44f60..0a95322ea54acf6c2ae45afe9c97d3386af267f5 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -116,7 +116,7 @@ for h in $heads; do
                fi
        }
 
-       hlog=$(git log -1 --oneline $h) 2>/dev/null
+       hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
        log Merging $h "($hlog)"
        old_head=$(git rev-parse HEAD)
        [ -x "../pre-merge/$tree" ] && {