shithub: git9

Info  •  Files  •  Log  •  Branches

Only update the branch afer successfully checking out the files.

diff: cannot open b/test//null: file does not exist: 'b/test//null'

--- a/branch

+++ b/branch

@@ -79,10 +79,10 @@

 if(! ~ $#stay 0)

 	exit

-echo ref: $new > .git/HEAD

 modified=`$nl{git/query -c HEAD $base | grep '^[+~]' | sed 's/^..//'}

 deleted=`$nl{git/query -c HEAD $base | grep '^-' | sed 's/^..//'}

+

 if(! ~ $#modified 0 || ! ~ $#deleted 0){

 	if(! git/walk -q $modified $deleted){

 		echo remote changes would clobber local changes >[1=2]

@@ -107,3 +107,5 @@

 	rm -f $deleted

 	rm -f .git/index9/tracked/$deleted

 }

+

+echo ref: $new > .git/HEAD