code: plan9front

Info  •  Files  •  Log

git/fs: preserve mode bits when walking branch dirs

when walking through a nested branch directory, we may not
set the DMDIR bit and confuse things.

--- a/sys/src/cmd/diff/merge3.c

+++ b/sys/src/cmd/diff/merge3.c

@@ -128,7 +128,6 @@

 			il++;

 			ir++;

 			status = "conflict";

-abort();

 		}else if(rc == nil || (lc != nil && lx < rx)){

 			fetch(l, l->ixold, ln, lc->oldx-1, l->input[0], "");

 			fetch(l, l->ixnew, lc->newx, lc->newy, l->input[1], "");

--- a/sys/src/cmd/git/fs.c

+++ b/sys/src/cmd/git/fs.c

@@ -621,6 +621,8 @@

 			q->path = qpath(o, Qbranch, c->obj->id, Qcommit);

 		else

 			e = Eexist;

+		if(d != nil)

+			c->mode = d->mode & ~0222;

 		free(d);

 		break;

 	case Qobject: