@@ -42,17 +42,16 @@ fi
 args=$*
 shift $shift_args
 files="$1"
-patch=`tempfile -p $suffix`
-orig=`tempfile -p $suffix`
-tempfiles="$patch $orig"
+patch=`tempfile --suffix $suffix`
+tempfiles="$patch"
 if [ -z $files ] || ! [ -f $files ] ; then
     # No file given, so loop over all files svn st says have changed
     files=$(git status 2> /dev/null | grep -e "modified:" | cut -c 15-)
     for f in $files; do
       if ! [ -f $f ]; then break; fi
+      orig=`tempfile --suffix $suffix`
       filename=`basename $f`
-      ending=${filename/*./}
-      orig=$orig"."$ending 
+      orig=$orig"."$filename
       cp "$f" $orig
       git diff $args $f > $patch
       if ! [ $? -eq 0 ]; then break; fi
@@ -64,8 +63,7 @@ if [ -z $files ] || ! [ -f $files ] ; then
 else
     # file given, so just work with that one
     filename=`basename $files`
-    ending=${filename/*./}
-    orig=$orig"."$ending
+    orig=$orig"."$filename
     cp $files $orig
     git diff $args > $patch
     if ! [ $? -eq 0 ]; then break; fi