git: plan9front

Info  •  Files  •  Log  •  Branches

git/branch: stop emitting incorrect 'merge failed' messages

--- a/sys/src/cmd/git/branch

+++ b/sys/src/cmd/git/branch

@@ -114,8 +114,9 @@

 for(ours in $dirtypaths){

 	common=$gitfs/object/$orig/tree/$ours

 	theirs=$gitfs/object/$base/tree/$ours

-	merge1 $ours $ours $common $theirs || st=$status

-	if(! ~ $#st 1)

+	merge1 $ours $ours $common $theirs

+	st=$status

+	if(! ~ $st '')

 		>[1=2] echo merge failed $ours: $st

 }

 if(~ $new */*)

-- 

⑨