fishdescriptor: wip reconsider approach

[chiark-utils.git] / scripts / cvs-adjustroot

diff --git a/scripts/cvs-adjustroot b/scripts/cvs-adjustroot
index 081859fcdb58b6ba60e97d55c65dfd3b054e8855..080029c7320a7b549b137e1a4eab1aec682a828a 100755 (executable)
--- a/scripts/cvs-adjustroot
+++ b/scripts/cvs-adjustroot
@@ -35,6 +35,7 @@ new="$1"; shift
 
 if $reinvoke; then
        filename="$1";
+       if cmp -- "$filename" <(printf "%s\n" "$new"); then exit 0; fi
        cmp -- "$filename" <(printf "%s\n" "$old")
        printf "%s\n" "$new" >"$filename".new
        mv -f -- "$filename".new "$filename"
@@ -47,6 +48,6 @@ fi
 # nonzero exit status when appropriate.
 
 find   -path '*/CVS/Root'                                              \
-  \(   -exec cvs-adjustroot --reinvoke "$old" "$new" '{}' ';'          \
+  \(   -exec "$0" --reinvoke "$old" "$new" '{}' ';'                    \
   -o   -exec false '{}' +                                              \
   \)