commit 55d7ae68564373617ee5a7bd54833ec203afedb0 Author: Nicolas Vigier boklm@torproject.org Date: Thu Apr 21 23:00:28 2016 +0200

fetch-inputs.sh: checkout git repositories with -f

Update git repositories using "git checkout -f" to throw away local changes.

This avoids an error when updating https-everywhere where a submodule was merged to the main repository. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7c9daee..4f3c886 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -99,7 +99,7 @@ update_git() { fi

if [ -n "$tag" ]; then - (cd "$dir" && git checkout "$tag") + (cd "$dir" && git checkout -f "$tag") fi

# If we're not verifying tags, then some of the tags