diff --git a/contrib/kiss-preferred b/contrib/kiss-preferred new file mode 100755 index 0000000..49dcbdd --- /dev/null +++ b/contrib/kiss-preferred @@ -0,0 +1,7 @@ +#!/bin/sh -e +# Lists the owners of all files with conflicts + +kiss a | sort -u -k2 | while read -r _ path; do + echo "$(kiss owns "$path")" "$path" +done + diff --git a/kiss b/kiss index d783d13..446c2b3 100755 --- a/kiss +++ b/kiss @@ -1443,7 +1443,7 @@ args() { # # This handles the globbing characters '*', '!', '[' and ']' as per: # https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html - [ "${action##[as]*}" ] && case "$*" in *\**|*\!*|*\[*|*\]*) + [ "${action##[aos]*}" ] && case "$*" in *\**|*\!*|*\[*|*\]*) die "Arguments contain invalid characters: '!*[]' ($*)" esac