From 4bf8e97a9e148f2b90309c1d8475ddedc9e11d52 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Thu, 21 Jul 2022 19:30:46 +0000
Subject: [PATCH] git-branchless: add patch for test failures with latest Git

---
 .../git-and-tools/git-branchless/default.nix             | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
index 13ba738c46fb..0b7446b7ddab 100644
--- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
@@ -48,6 +48,15 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_next_ambiguous_interactive"
   ];
 
+  # Fixed in next release
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/arxanas/git-branchless/commit/8bed1e83495a448f479103d2d4b75745aa512667.patch";
+      sha256 = "sha256-bFfXBYxfgx1TxlJ+/2Gh9WsgL2vCJKwwbq4JD8/2c1w=";
+      name = "fix-tests-for-latest-git";
+    })
+  ];
+
   meta = with lib; {
     description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history";
     homepage = "https://github.com/arxanas/git-branchless";