aboutsummaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2019-03-13 21:04:07 -0400
committerAndrew Robbins <contact@andrewrobbins.info>2019-03-13 21:04:07 -0400
commita4bcf4852289c58852b308eab94e9bc48b7ef814 (patch)
treefb817d4d9e0c263ffd04f288c1ef536fe253e3da /libs
parentbd84ece1d42d00d48357ab31ca85a2f2f546fd84 (diff)
downloadlibrebootfr-a4bcf4852289c58852b308eab94e9bc48b7ef814.tar.gz
librebootfr-a4bcf4852289c58852b308eab94e9bc48b7ef814.zip
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.
Diffstat (limited to 'libs')
-rwxr-xr-xlibs/git2
1 files changed, 1 insertions, 1 deletions
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() {