shithub: git9

Info  •  Files  •  Log  •  Branches

Improve experience with new repositories.

	No force pushes needed, master branch is tagged for interop.

--- a/diff

+++ b/diff

@@ -15,7 +15,7 @@

 while(~ $1 -*){

 	switch($1){

-	case -b; branch=$2; shift

+	case -b; branch=`{git/query $2}; shift

 	case *; usage

 	}

 	shift

--- a/init

+++ b/init

@@ -39,3 +39,8 @@

 	echo '[remote "origin"]' >> $dir/$sub/config

 	echo '	url='$upstream >> $dir/$sub/config

 }

+echo '[branch "master"]' >> $dir/$sub/config

+echo '	remote = origin' >> $dir/$sub/config

+echo '	merge = refs/heads/master'  >> $dir/$sub/config

+mkdir -p $dir/$sub/refs/heads

+mkdir -p $dir/$sub/refs/remotes

--- a/send.c

+++ b/send.c

@@ -318,7 +318,7 @@

 		u = &upd[i];

 		a = readobject(u->theirs);

 		b = readobject(u->ours);

-		if((!force || hasheq(&u->theirs, &Zhash)) && (a == nil || ancestor(a, b) != a)){

+		if(!force && !hasheq(&u->theirs, &Zhash) && (a == nil || ancestor(a, b) != a)){

 			fprint(2, "remote has diverged\n");

 			werrstr("force needed");

 			updating=0;