X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-patch.sh;h=48f4d770059bc7e7cb99bd8b005ad1ae1aeb932e;hb=e5274deedc606f3a2eb69886e127a60534a82872;hp=45da3042455cbc466553451e8cb89627093c4804;hpb=308892d0c071135031994606170c8be6653e7197;p=topgit.git diff --git a/tg-patch.sh b/tg-patch.sh index 45da304..48f4d77 100644 --- a/tg-patch.sh +++ b/tg-patch.sh @@ -29,7 +29,7 @@ echo [ -n "$(git grep '^[-]--' "$name" -- ".topmsg")" ] || echo '---' # Evil obnoxious hack to work around the lack of git diff --exclude -git_is_stupid="$(mktemp)" +git_is_stupid="$(mktemp -t tg-patch-changes.XXXXXX)" git diff-tree --name-only "$base_rev" "$name" | fgrep -vx ".topdeps" | fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail randomly? @@ -41,6 +41,6 @@ fi rm "$git_is_stupid" echo '-- ' -echo "tg: ($base_rev..) $name (depends on $(git cat-file blob "$name:.topdeps"))" +echo "tg: ($base_rev..) $name (depends on: $(git cat-file blob "$name:.topdeps" | paste -s -d' '))" branch_contains "$name" "$base_rev" || echo "tg: The patch is out-of-date wrt. the base! Run \`tg update\`."