Junio C Hamano, Mon, May 19, 2008 06:51:16 +0200: > Alex Riesen <raa.lkml@xxxxxxxxx> writes: > > > diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh > > index c8310ae..f1c91c8 100755 > > --- a/t/t6031-merge-recursive.sh > > +++ b/t/t6031-merge-recursive.sh > > @@ -12,8 +12,7 @@ test_expect_success 'mode change in one branch: keep changed version' ' > > git add dummy && > > git commit -m a && > > git checkout -b b1 master && > > - chmod +x file1 && > > - git add file1 && > > + git update-index --chmod=+x file1 && > > git commit -m b1 && > > git checkout a1 && > > git merge-recursive master -- a1 b1 && > > I have to wonder if this is enough on a filesystem with usable executable > bit. Has this been tested on both kinds of filesystems? Yes and yes. > You aren't setting +x on work tree file anymore, but only flipping the bit > inside the index before committing. Because of this change, after "b1" > commit, work tree has a local modification relative to the commit (namely, > reversion of chmod +x is in the work tree), which is different from the > original test sequence. Doesn't this local modification interact with > switching to a1 branch and what merge-recursive does? I think no (I depend on this in my workflows on both systems). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
