bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

Merge pull request #199 from TAAPArthur/master

Browse Source 
kiss-preferred: new utility to list all current conflicts resolutions.
This commit is contained in:
dylan 2020-11-19 11:41:29 +02:00 committed by GitHub
commit 7fdf69dfc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/kiss-preferred Executable file
View File

@ -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

2
kiss
View File

@ -1443,7 +1443,7 @@ args() {
# #
# This handles the globbing characters '*', '!', '[' and ']' as per: # This handles the globbing characters '*', '!', '[' and ']' as per:
# https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html # https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
[ "${action##[as]*}" ] && case "$*" in *\**|*\!*|*\[*|*\]*) [ "${action##[aos]*}" ] && case "$*" in *\**|*\!*|*\[*|*\]*)
die "Arguments contain invalid characters: '!*[]' ($*)" die "Arguments contain invalid characters: '!*[]' ($*)"
esac esac