Add version for 0.13.1

Fixes #3687. Uses the cast suggested by @MichaelEischer, except that the
contant isn't cast along, because it's untyped and will be converted by
the compiler as necessary.

CHANGELOG.md

@@ -1,3 +1,39 @@
+Changelog for restic 0.13.1 (2022-04-10)
+=======================================
+
+The following sections list the changes in restic 0.13.1 relevant to
+restic users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #3685: Fix the diff command
+ * Fix #3681: Fix rclone (shimmed by Scoop) and sftp stopped working on Windows
+
+Details
+-------
+
+ * Bugfix #3685: Fix the diff command
+
+   There was a bug in the `diff` command, it would always show files in a removed directory as added.
+   We've fixed that.
+
+   https://github.com/restic/restic/issues/3685
+   https://github.com/restic/restic/pull/3686
+
+ * Bugfix #3681: Fix rclone (shimmed by Scoop) and sftp stopped working on Windows
+
+   In #3602 a fix was introduced to fix the problem that rclone prematurely exits when Ctrl+C is
+   pressed on Windows. The solution was to create the subprocess with its console detached from
+   the restic console. However, such solution fails when using rclone install by scoop or using
+   sftp with a passphrase- protected private key. We've fixed that by using a different approach
+   to prevent Ctrl-C from passing down too early.
+
+   https://github.com/restic/restic/issues/3681
+   https://github.com/restic/restic/issues/3692
+   https://github.com/restic/restic/pull/3696
+
+
 Changelog for restic 0.13.0 (2022-03-26)
 =======================================
 

VERSION

@@ -1 +1 @@
-0.13.0
+0.13.1

changelog/0.13.1_2022-04-10/issue-3685

@@ -0,0 +1,7 @@
+Bugfix: Fix the diff command
+
+There was a bug in the `diff` command, it would always show files in a removed
+directory as added. We've fixed that.
+
+https://github.com/restic/restic/issues/3685
+https://github.com/restic/restic/pull/3686

changelog/0.13.1_2022-04-10/issue-3692

@@ -0,0 +1,12 @@
+Bugfix: Fix rclone (shimmed by Scoop) and sftp stopped working on Windows
+
+In #3602 a fix was introduced to fix the problem that rclone prematurely exits
+when Ctrl+C is pressed on Windows. The solution was to create the subprocess
+with its console detached from the restic console. However, such solution
+fails when using rclone install by scoop or using sftp with a passphrase-
+protected private key. We've fixed that by using a different approach to prevent
+Ctrl-C from passing down too early.
+
+https://github.com/restic/restic/issues/3681
+https://github.com/restic/restic/issues/3692
+https://github.com/restic/restic/pull/3696

cmd/restic/cmd_diff.go

@@ -170,7 +170,7 @@ func (c *Comparer) printDir(ctx context.Context, mode string, stats *DiffStat, b
 		if node.Type == "dir" {
 			name += "/"
 		}
-		c.printChange(NewChange(name, "+"))
+		c.printChange(NewChange(name, mode))
 		stats.Add(node)
 		addBlobs(blobs, node)
 

cmd/restic/global.go

@@ -40,7 +40,7 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 )
 
-var version = "0.13.0"
+var version = "0.13.1"
 
 // TimeFormat is the format used for all timestamps printed by restic.
 const TimeFormat = "2006-01-02 15:04:05"

internal/backend/foreground_windows.go

@@ -11,7 +11,7 @@ import (
 func startForeground(cmd *exec.Cmd) (bg func() error, err error) {
 	// just start the process and hope for the best
 	cmd.SysProcAttr = &syscall.SysProcAttr{}
-	cmd.SysProcAttr.CreationFlags = windows.DETACHED_PROCESS
+	cmd.SysProcAttr.CreationFlags = windows.CREATE_NEW_PROCESS_GROUP
 	err = cmd.Start()
 	if err != nil {
 		return nil, errors.Wrap(err, "cmd.Start")

internal/fs/setflags_linux_test.go

@@ -59,9 +59,13 @@ func supportsNoatime(t *testing.T, f *os.File) bool {
 	err := unix.Fstatfs(int(f.Fd()), &fsinfo)
 	rtest.OK(t, err)
 
-	return fsinfo.Type == unix.BTRFS_SUPER_MAGIC ||
+	// The funky cast works around a compiler error on 32-bit archs:
-		fsinfo.Type == unix.EXT2_SUPER_MAGIC ||
+	// "unix.BTRFS_SUPER_MAGIC (untyped int constant 2435016766) overflows int32".
-		fsinfo.Type == unix.EXT3_SUPER_MAGIC ||
+	// https://github.com/golang/go/issues/52061
-		fsinfo.Type == unix.EXT4_SUPER_MAGIC ||
+	typ := int64(uint(fsinfo.Type))
-		fsinfo.Type == unix.TMPFS_MAGIC
+	return typ == unix.BTRFS_SUPER_MAGIC ||
+		typ == unix.EXT2_SUPER_MAGIC ||
+		typ == unix.EXT3_SUPER_MAGIC ||
+		typ == unix.EXT4_SUPER_MAGIC ||
+		typ == unix.TMPFS_MAGIC
 }