X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=fork;h=51883568272ae6cd3ff03149663e0dacf0217c6f;hb=e364445d1adb40b906101cb3ce1acde85b2ffd36;hp=99a84766258911f57c08a9c73ddc9fcd346161d9;hpb=820288d1b046f3023b4f5267630e3d5307c90981;p=git-scripts.git

diff --git a/fork b/fork
index 99a8476..5188356 100755
--- a/fork
+++ b/fork
@@ -1,28 +1,40 @@
 #! /bin/sh
 
-if [ -z "$2" ]; then
-   echo "Usage: $0 upstream origin" >&2
+if [ -z "$2" -o -n "$4" ]; then
+   echo "Usage: $0 upstream origin [local]" >&2
    exit 1
 fi
 
 upstream="$1"
 origin="$2"
-local_repo="`basename \"$origin\" .git`"
+local_repo="$3"
+test -z "$local_repo" && local_repo="`basename \"$origin\" .git`"
 
-git clone -o upstream "$upstream" "$local_repo" &&
-cd "$local_repo" &&
-git remote add origin "$origin" &&
+if [ -d "$local_repo"/.git ]; then
+   cd "$local_repo"
+fi &&
 
-chmod a-x .git/config &&
-branch="`git branch | awk '/^\*/ {print $2}'`" &&
+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 &&
 
+"`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 &&
 git config branch.$branch.merge refs/heads/$branch &&
 git config push.default current &&
 
-git gc --aggressive &&
-exec pwd >> "`dirname \"$0\"`"/locate-all.list
+exec git gc --aggressive