diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 4dd0f9c7c888..ded7316167c7 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -30,7 +30,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.47.2";
+  version = "2.48.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
 in
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-sZJovmtvFVa0ep3YNCcuFn06dXQM3NKDzzgS7f/jkw8=";
+    hash = "sha256-HF1UX13B61HpXSxQ2Y/fiLGja6H6MOmuXVOFxgJPgq0=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -138,15 +138,20 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
 
-  postBuild = ''
-    make -C contrib/subtree
-  '' + (lib.optionalString perlSupport ''
+  postBuild = lib.optionalString withManual ''
+    # Need to build the main Git documentation before building the
+    # contrib/subtree documentation, as the latter depends on the
+    # asciidoc.conf file created by the former.
+    make -C Documentation
+  '' + ''
+    make -C contrib/subtree all ${lib.optionalString withManual "doc"}
+  '' + lib.optionalString perlSupport ''
     make -C contrib/diff-highlight
-  '') + (lib.optionalString osxkeychainSupport ''
+  '' + lib.optionalString osxkeychainSupport ''
     make -C contrib/credential/osxkeychain
-  '') + (lib.optionalString withLibsecret ''
+  '' + lib.optionalString withLibsecret ''
     make -C contrib/credential/libsecret
-  '');
+  '';
 
 
   ## Install
@@ -156,15 +161,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   installFlags = [ "NO_INSTALL_HARDLINKS=1" ];
 
-  preInstall = (lib.optionalString osxkeychainSupport ''
+  preInstall = lib.optionalString osxkeychainSupport ''
     mkdir -p $out/bin
     ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/
     rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o
-  '') + (lib.optionalString withLibsecret ''
+  '' + lib.optionalString withLibsecret ''
     mkdir -p $out/bin
     ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/
     rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o
-  '');
+  '';
 
   postInstall =
     ''
diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix
index f3fcd9a578de..a9185a72693f 100644
--- a/pkgs/build-support/fetchgit/tests.nix
+++ b/pkgs/build-support/fetchgit/tests.nix
@@ -33,7 +33,7 @@
     name = "leave-git-nix-source";
     url = "https://github.com/NixOS/nix";
     rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
-    sha256 = "sha256-zZxDxqaeWvuWuzwPizBLR7d59zP24+zqnWllNICenko=";
+    sha256 = "sha256-3YYVIeaeu6zO7bBkZxF+1d5VS0K2GHYEZwChB3tPJ4s=";
     leaveDotGit = true;
   };
 
@@ -49,7 +49,7 @@
     name = "submodule-leave-git-source";
     url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule";
     rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a";
-    sha256 = "sha256-+uXIClcRJ4S1rdgx2Oyww+Jv4h1VXp8tfeh9lb07Fhk=";
+    sha256 = "sha256-0pwleO/m4Iws3BF9ewyWbYMcGfEJLS3BYzWfDSYtXs8=";
     leaveDotGit = true;
     fetchSubmodules = true;
   };
@@ -58,7 +58,7 @@
     name = "submodule-deep-source";
     url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule";
     rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a";
-    sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw=";
+    sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8=";
     deepClone = true;
     fetchSubmodules = true;
   };
@@ -67,7 +67,7 @@
     name = "submodule-leave-git-deep-source";
     url = "https://github.com/pineapplehunter/nix-test-repo-with-submodule";
     rev = "26473335b84ead88ee0a3b649b1c7fa4a91cfd4a";
-    sha256 = "sha256-LL7uhXQk3N3DcvBBxwjmfVx55tTXCGQ19T91tknopzw=";
+    sha256 = "sha256-eRHOwolRZDJS/5zk88e7SdoO7nKKtjDXMLVsyFPFgk8=";
     deepClone = true;
     leaveDotGit = true;
     fetchSubmodules = true;