[tor-commits] [tor-browser-bundle/maint-5.5] fetch-inputs.sh: checkout git repositories with -f

[boklm@xxxxxxxxxxxxxx]

commit cbd10de83965b6badaa86489801cf7a5ec78303e
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
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 7c55ba8..1ff49f8 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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits