Ticket #331: quilt-0.48.patch

changes2changelog

@@ -1 @@
-#! /usr/bin/perl
+#!perl
 
 $ENV{"LC_ALL"} = "C";
 

quilt.quiltrc

@@ -12 +12 @@
 #QUILT_DIFFSTAT_OPTS="-f0"
 
 # Options to pass to commands (QUILT_${COMMAND}_ARGS)
-QUILT_PUSH_ARGS="--color=auto"
-QUILT_DIFF_ARGS="--no-timestamps --color=auto"
+QUILT_PUSH_ARGS=""
+QUILT_DIFF_ARGS="--no-timestamps"
 QUILT_REFRESH_ARGS="--no-timestamps --backup"
 
 # (Add "-p ab" to QUILT_DIFF_ARGS and QUILT_REFRESH_ARGS to get
@@ -28 +28 @@
 
 # Use a specific editor for quilt (defaults to the value of $EDITOR before
 # sourcing this configuration file, or vi if $EDITOR wasn't set).
-#EDITOR=nedit
+EDITOR=nano

configure.ac

@@ -69 +69 @@
 fi
 
 QUILT_COMPAT_PROG_PATH(CP, cp, [gcp cp])
-AC_MSG_CHECKING(whether $CP -l works)
-touch conftest.1
-if $CP -l conftest.1 conftest.2 2>/dev/null; then
-        AC_MSG_RESULT(yes)
-else
-        AC_MSG_ERROR([no
-
-You appear to have a `cp' that does not support hard links.
-You can download GNU fileutils from ftp.gnu.org
-])
-fi
 
 QUILT_COMPAT_PROG_PATH(DATE, date, [gdate date])
 

quilt/scripts/dependency-graph.in

@@ -438 +438 @@
     $out = new FileHandle("| tred")
         or die "tred: $!\n";
 } else {
-    $out = new FileHandle("> /dev/stdout")
-        or die "$!\n";
+    $out = *STDOUT;
 }
 
 # Write graph

lib/backup-files.c

@@ -224 +224 @@
         if (link(from, to) == 0)
                 return 0;
         if (errno != EXDEV && errno != EPERM &&
-            errno != EMLINK && errno != ENOSYS) {
+            errno != EMLINK && errno != ENOSYS &&
+            errno != EOPNOTSUPP) {
                 fprintf(stderr, "Could not link file `%s' to `%s': %s\n",
                        from, to, strerror(errno));
                 return 1;