From 6c8b45460a614969feb5f74798df18c417ee16b1 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 19 Dec 2016 13:37:06 +1300
Subject: Make diff default even more conservative

---
 sh/shrc.d/diff.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sh/shrc.d')

diff --git a/sh/shrc.d/diff.sh b/sh/shrc.d/diff.sh
index 179ced94..9ba2f983 100644
--- a/sh/shrc.d/diff.sh
+++ b/sh/shrc.d/diff.sh
@@ -1,14 +1,14 @@
-# Use a unified format for diff(1) by default
+# Use a unified format for diff(1) by default if two files and no options given
 diff() {
     if (
         for arg ; do
             case $arg in
-                -*) shift ;;
                 --) shift ; break ;;
+                -*) return 1 ;;
                 *) break ;;
             esac
         done
-        [ "$#" -gt 1 ]
+        [ "$#" -eq 2 ]
     ) ; then
         set -- -u "$@"
     fi
-- 
cgit v1.2.3