public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix-prefetch-git: Fix output mangling

Browse Source 
`git repack` and `git gc` sometimes print “Nothing new to pack.”
to stdout, which breaks redirecting output to JSON file.

Let’s move the stdout of all git calls where it is not used to stderr
so that we still receive the info but it does not pollute our output.
This commit is contained in:
Jan Tojnar 2020-02-14 21:27:47 +01:00
parent f19a101a73
commit 28faf5bc86
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/build-support/fetchgit/nix-prefetch-git
View File

@ -53,6 +53,11 @@ Options:
exit 1 exit 1
} }
# some git commands print to stdout, which would contaminate our JSON output
clean_git(){
git "$@" >&2
}
argi=0 argi=0
argfun="" argfun=""
for arg; do for arg; do
@ -98,9 +103,9 @@ fi
init_remote(){ init_remote(){
local url=$1 local url=$1
git init clean_git init
git remote add origin "$url" clean_git remote add origin "$url"
( [ -n "$http_proxy" ] && git config http.proxy "$http_proxy" ) || true ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true
} }
# Return the reference of an hash if it exists on the remote repository. # Return the reference of an hash if it exists on the remote repository.
@ -141,8 +146,8 @@ checkout_hash(){
hash=$(hash_from_ref "$ref") hash=$(hash_from_ref "$ref")
fi fi
git fetch -t ${builder:+--progress} origin || return 1 clean_git fetch -t ${builder:+--progress} origin || return 1
git checkout -b "$branchName" "$hash" || return 1 clean_git checkout -b "$branchName" "$hash" || return 1
} }
# Fetch only a branch/tag and checkout it. # Fetch only a branch/tag and checkout it.
@ -164,8 +169,8 @@ checkout_ref(){
if test -n "$ref"; then if test -n "$ref"; then
# --depth option is ignored on http repository. # --depth option is ignored on http repository.
git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1 clean_git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1
git checkout -b "$branchName" FETCH_HEAD || return 1 clean_git checkout -b "$branchName" FETCH_HEAD || return 1
else else
return 1 return 1
fi fi
@ -174,7 +179,7 @@ checkout_ref(){
# Update submodules # Update submodules
init_submodules(){ init_submodules(){
# Add urls into .git/config file # Add urls into .git/config file
git submodule init clean_git submodule init
# list submodule directories and their hashes # list submodule directories and their hashes
git submodule status | git submodule status |
@ -248,7 +253,7 @@ make_deterministic_repo(){
# Remove all remote branches. # Remove all remote branches.
git branch -r | while read -r branch; do git branch -r | while read -r branch; do
git branch -rD "$branch" >&2 clean_git branch -rD "$branch"
done done
# Remove tags not reachable from HEAD. If we're exactly on a tag, don't # Remove tags not reachable from HEAD. If we're exactly on a tag, don't
@ -256,19 +261,19 @@ make_deterministic_repo(){
maybe_tag=$(git tag --points-at HEAD) maybe_tag=$(git tag --points-at HEAD)
git tag --contains HEAD | while read -r tag; do git tag --contains HEAD | while read -r tag; do
if [ "$tag" != "$maybe_tag" ]; then if [ "$tag" != "$maybe_tag" ]; then
git tag -d "$tag" >&2 clean_git tag -d "$tag"
fi fi
done done
# Do a full repack. Must run single-threaded, or else we lose determinism. # Do a full repack. Must run single-threaded, or else we lose determinism.
git config pack.threads 1 clean_git config pack.threads 1
git repack -A -d -f clean_git repack -A -d -f
rm -f .git/config rm -f .git/config
# Garbage collect unreferenced objects. # Garbage collect unreferenced objects.
# Note: --keep-largest-pack prevents non-deterministic ordering of packs # Note: --keep-largest-pack prevents non-deterministic ordering of packs
# listed in .git/objects/info/packs by only using a single pack # listed in .git/objects/info/packs by only using a single pack
git gc --prune=all --keep-largest-pack clean_git gc --prune=all --keep-largest-pack
) )
} }