Feat(ls-assumed): Recognize files with skip-worktree bit

[git-scripts.git] / fork

diff --git a/fork b/fork
index 146cde45fe6e30096f038b4b0680e97cce5b0d5c..09248da1bf3087dfa66a3d200bf72624aa35f402 100755 (executable)
--- a/fork
+++ b/fork
@@ -14,17 +14,17 @@ if [ -d "$local_repo"/.git ]; then
 fi &&
 
 if [ -d .git ]; then
-   git remote add upstream "$upstream" &&
-   git remote set-url origin "$origin"
+   git remote add upstream "$upstream"
+   git remote set-url origin "$origin" || git remote add origin "$origin"
 else
    git clone -o upstream "$upstream" "$local_repo" &&
    cd "$local_repo" &&
-   pwd >> "`dirname \"$0\"`"/locate-all.list &&
+   chmod a-x .git/config &&
    git remote add origin "$origin"
 fi &&
 
-chmod a-x .git/config &&
-branch="`git rev-parse --abbrev-ref HEAD`"
+pwd >> "`dirname \"$0\"`"/locate-all.list &&
+branch="`git rev-parse --abbrev-ref HEAD`" &&
 
 git pull upstream $branch &&
 git pull origin $branch &&