Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Merge pull request #42376 from dtzWill/update/git-2.18.0"
This reverts commit 2624f90, reversing changes made to 37aab4c. See: #42376 (comment) Basically this breaks at least some users of fetchgit, so let's revert this until this is sorted out.
- Loading branch information
Showing
2 changed files
with
16 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/Makefile b/Makefile | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -2609,8 +2609,7 @@ | ||
{ test "$$bindir/" = "$$execdir/" || \ | ||
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ | ||
$(RM) "$$execdir/$$p" && \ | ||
- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ | ||
- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ | ||
+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ | ||
cp "$$bindir/$$p" "$$execdir/$$p" || exit; \ | ||
done; \ | ||
} && \ |