From a4bcf4852289c58852b308eab94e9bc48b7ef814 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Wed, 13 Mar 2019 21:04:07 -0400 Subject: libs/git: Apply patches before removing blobs Patching before removing blobs is cleaner since patches are applied against a freshly created and checked out branch at the specified revision. Applying patches first also seems to reduce the likelihood of failed patching attempts due to a nebulous error about files not matching the git index (but doesn't eliminate it). More debugging required. --- libs/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/git b/libs/git index 5f48005d..16dd5411 100755 --- a/libs/git +++ b/libs/git @@ -289,8 +289,8 @@ git_project_prepare() { shift git_project_prepare_revision "$project" "$repository" "$@" - git_project_prepare_blobs "$project" "$repository" "$@" git_project_prepare_patch "$project" "$repository" "$@" + git_project_prepare_blobs "$project" "$repository" "$@" } git_project_prepare_blobs() { -- cgit v1.2.3-70-g09d2