From 367923b37842271b18be65ee585d0182cf566f26 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Thu, 19 Nov 2020 11:48:33 +0200
Subject: [PATCH] kiss-preferred: fixes

---
 contrib/kiss-preferred | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/contrib/kiss-preferred b/contrib/kiss-preferred
index 49dcbdd..7e8df27 100755
--- a/contrib/kiss-preferred
+++ b/contrib/kiss-preferred
@@ -1,7 +1,12 @@
 #!/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"
+kiss a | while read -r _ path; do
+    if owner=$(kiss owns "$path" 2>/dev/null) && [ "$owner" ]; then
+        printf '%s %s\n' "$owner" "$path"
+
+    else
+        printf 'warning: %s has no owner\n' "$path" >&2
+    fi
 done