X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=fork;h=2a537b483b87c5d4d0079fcf465918531fdbaa01;hb=6b655b7f82a080370305ac6c0b8a8f7d12a4c0af;hp=64a281c2df31895b28a076401cef1f3087402fe4;hpb=7f923927d1c434b0ea0853bfeea5ff5ef3fc08fe;p=git-scripts.git

diff --git a/fork b/fork
index 64a281c..2a537b4 100755
--- a/fork
+++ b/fork
@@ -9,16 +9,27 @@ upstream="$1"
 origin="$2"
 local_repo="`basename \"$origin\" .git`"
 
-git clone -o upstream "$upstream" "$local_repo" &&
-cd "$local_repo" &&
-pwd >> "`dirname \"$0\"`"/locate-all.list &&
-git remote add origin "$origin" &&
+if [ -d "$local_repo"/.git ]; then
+   cd "$local_repo"
+fi &&
+
+if [ -d .git ]; then
+   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" &&
+   chmod a-x .git/config &&
+   git remote add origin "$origin"
+fi &&
 
-chmod a-x .git/config &&
-branch="`git branch | awk '/^\*/ {print $2}'`" &&
+"`dirname \"$0\"`"/set-commit-date-recursive &&
+pwd >> "`dirname \"$0\"`"/locate-all.list &&
+branch="`git rev-parse --abbrev-ref HEAD`" &&
 
+git pull upstream $branch &&
 git pull origin $branch &&
-git push -u origin &&
+git push -u origin $branch &&
 
 git config branch.$branch.remote upstream &&
 git config branch.$branch.remotepush origin &&