Merge pull request git-lfs#4879 from git-lfs/release-next

release: v3.1.2

Author: bk2204

.github/workflows/ci.yml

@@ -10,9 +10,7 @@ jobs:
         go: ['1.17.x']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - uses: actions/setup-go@v2
       with:
@@ -43,9 +41,7 @@ jobs:
         go: ['1.13.x', '1.14.x']
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-go@v2
       with:
         go-version: ${{ matrix.go }}
@@ -54,9 +50,7 @@ jobs:
     name: Build on Windows
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - uses: actions/setup-go@v2
       with:
@@ -112,9 +106,7 @@ jobs:
         os: [ubuntu-20.04, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - run: git clone -b master https://github.com/git/git.git "$HOME/git"
     - run: script/build-git "$HOME/git"
     - run: GIT_DEFAULT_HASH=sha256 script/cibuild
@@ -125,19 +117,15 @@ jobs:
         os: [ubuntu-20.04, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - run: git clone -b v2.0.0 https://github.com/git/git.git "$HOME/git"
     - run: script/build-git "$HOME/git"
     - run: script/cibuild
   build-docker:
     name: Build Linux packages
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - run: git clone https://github.com/git-lfs/build-dockers.git "$HOME/build-dockers"
     - run: (cd "$HOME/build-dockers" && ./build_dockers.bsh)
@@ -150,9 +138,7 @@ jobs:
         arch: [arm64]
         container: [debian_11]
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - run: |
         echo '{"experimental": true}' | sudo tee /etc/docker/daemon.json

.github/workflows/release.yml

@@ -11,9 +11,7 @@ jobs:
       matrix:
         go: ['1.17.x']
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - uses: actions/setup-go@v2
       with:
@@ -65,9 +63,7 @@ jobs:
       matrix:
         go: ['1.17.x']
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - uses: actions/setup-go@v2
       with:
@@ -103,9 +99,7 @@ jobs:
       matrix:
         go: ['1.17.x']
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - uses: actions/setup-go@v2
       with:
@@ -131,9 +125,7 @@ jobs:
     name: Build Linux Packages
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - run: gem install packagecloud-ruby
     - run: git clone https://github.com/git-lfs/build-dockers.git "$HOME/build-dockers"
@@ -151,15 +143,14 @@ jobs:
         arch: [arm64]
         container: [debian_11]
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+    - uses: actions/checkout@v1
     - uses: actions/setup-ruby@v1
     - run: |
         echo '{"experimental": true}' | sudo tee /etc/docker/daemon.json
         sudo systemctl restart docker.service
         docker version -f '{{.Server.Experimental}}'
     - uses: docker/setup-qemu-action@v1
+    - run: gem install packagecloud-ruby
     - run: git clone https://github.com/git-lfs/build-dockers.git "$HOME/build-dockers"
     - run: (cd "$HOME/build-dockers" && ./build_dockers.bsh --arch=$ARCH $CONTAINER)
       env:

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Git LFS Changelog
 
+## 3.1.2 (16 Feb 2022)
+
+This is a bugfix release which fixes a bug in `git lfs install` and some issues
+in our CI release processes, including one that prevented arm64 packages for
+Debian 11 from being uploaded.
+
+### Bugs
+
+* lfs: add old hook content to the list of old hooks #4878 (@bk2204)
+
+### Misc
+
+* Revert "Merge pull request #4795 from bk2204/actions-checkout-v2" #4877 (@bk2204)
+* .github/workflows: install packagecloud gem #4873 (@bk2204)
+
 ## 3.1.1 (14 Feb 2022)
 
 This is a bugfix release which fixes a syntax error in the release workflow.

config/version.go

@@ -13,7 +13,7 @@ var (
 )
 
 const (
-	Version = "3.1.1"
+	Version = "3.1.2"
 )
 
 func init() {

debian/changelog

@@ -1,3 +1,9 @@
+git-lfs (3.1.2) stable; urgency=low
+
+  * New upstream version
+
+ -- brian m. carlson <[email protected]>  Wed, 16 Feb 2022 14:29:00 -0000
+
 git-lfs (3.1.1) stable; urgency=low
 
   * New upstream version

lfs/hook.go

@@ -18,6 +18,7 @@ import (
 var (
 	// The basic hook which just calls 'git lfs TYPE'
 	hookBaseContent = "#!/bin/sh\ncommand -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting '.git/hooks/{{Command}}'.\\n\"; exit 2; }\ngit lfs {{Command}} \"$@\""
+	hookOldContent  = "#!/bin/sh\ncommand -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/{{Command}}.\\n\"; exit 2; }\ngit lfs {{Command}} \"$@\""
 )
 
 // A Hook represents a githook as described in http://git-scm.com/docs/githooks.
@@ -39,20 +40,25 @@ func LoadHooks(hookDir string, cfg *config.Configuration) []*Hook {
 			"#!/bin/sh\ngit lfs pre-push \"$@\"",
 			"#!/bin/sh\ncommand -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository has been set up with Git LFS but Git LFS is not installed.\\n\"; exit 0; }\ngit lfs pre-push \"$@\"",
 			"#!/bin/sh\ncommand -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository has been set up with Git LFS but Git LFS is not installed.\\n\"; exit 2; }\ngit lfs pre-push \"$@\"",
+			hookOldContent,
 		}, cfg),
-		NewStandardHook("post-checkout", hookDir, []string{}, cfg),
-		NewStandardHook("post-commit", hookDir, []string{}, cfg),
-		NewStandardHook("post-merge", hookDir, []string{}, cfg),
+		NewStandardHook("post-checkout", hookDir, []string{hookOldContent}, cfg),
+		NewStandardHook("post-commit", hookDir, []string{hookOldContent}, cfg),
+		NewStandardHook("post-merge", hookDir, []string{hookOldContent}, cfg),
 	}
 }
 
 // NewStandardHook creates a new hook using the template script calling 'git lfs theType'
 func NewStandardHook(theType, hookDir string, upgradeables []string, cfg *config.Configuration) *Hook {
+	formattedUpgradeables := make([]string, 0, len(upgradeables))
+	for _, s := range upgradeables {
+		formattedUpgradeables = append(formattedUpgradeables, strings.Replace(s, "{{Command}}", theType, -1))
+	}
 	return &Hook{
 		Type:         theType,
 		Contents:     strings.Replace(hookBaseContent, "{{Command}}", theType, -1),
 		Dir:          hookDir,
-		upgradeables: upgradeables,
+		upgradeables: formattedUpgradeables,
 		cfg:          cfg,
 	}
 }

rpm/SPECS/git-lfs.spec

@@ -1,5 +1,5 @@
 Name:           git-lfs
-Version:        3.1.1
+Version:        3.1.2
 Release:        1%{?dist}
 Summary:        Git extension for versioning large files
 

versioninfo.json

@@ -4,7 +4,7 @@
 		"FileVersion": {
 			"Major": 3,
 			"Minor": 1,
-			"Patch": 1,
+			"Patch": 2,
 			"Build": 0
 		}
 	},
@@ -13,7 +13,7 @@
 		"FileDescription": "Git LFS",
 		"LegalCopyright": "GitHub, Inc. and Git LFS contributors",
 		"ProductName": "Git Large File Storage (LFS)",
-		"ProductVersion": "3.1.1"
+		"ProductVersion": "3.1.2"
 	},
 	"IconPath": "script/windows-installer/git-lfs-logo.ico"
 }