{"thread":{"id":"4087","subject":"Locking a branch","startedAt":"2006-05-07T02:50:43Z","lastAt":"2006-05-08T10:45:33Z","messageCount":2,"participants":["Pavel Roskin","Catalin Marinas"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"19635","messageId":"1146970243.24434.77.camel@dv","threadId":"4087","inReplyTo":null,"subject":"Locking a branch","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-05-07T02:50:43Z","receivedAt":"2006-05-07T02:50:43Z","isPatch":false,"sender":{"key":"proski@gnu.org","avatar":null},"body":"Hello!\n\nI see there is an active discussion about branch attributes.  It would\nbe nice to have an attribute to prevent git from changing the branch\nhead in any way.  The reason is that it interferes with StGIT on StGIT\nmanaged branches.  If StGIT is fine with the change, it would remove or\noverride the lock temporarily.  StGIT could also unlock the branch\npermanently if there are no applied patches.\n\nAnother use of the branch lock would be to prevent damage to remote\nbranches, such as \"origin\".  Committing anything to \"origin\" would break\nfetching.  In this case, git-fetch should be allowed to override the\nlock after checking .git/remotes, but other git commands should respect\nthe lock.\n\nIt should be possible to break locks, but the users would at least think\nbefore doing so.\n\n-- \nRegards,\nPavel Roskin\n"},{"id":"19707","messageId":"tnxzmhspzg2.fsf@arm.com","threadId":"4087","inReplyTo":"1146970243.24434.77.camel@dv","subject":"Re: Locking a branch","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@arm.com","sentAt":"2006-05-08T10:45:33Z","receivedAt":"2006-05-08T10:45:33Z","isPatch":false,"sender":{"key":"catalin.marinas@arm.com","avatar":null},"body":"Pavel Roskin <proski@gnu.org> wrote:\n> I see there is an active discussion about branch attributes.  It\n> would be nice to have an attribute to prevent git from changing the\n> branch head in any way.  The reason is that it interferes with StGIT\n> on StGIT managed branches.  If StGIT is fine with the change, it\n> would remove or override the lock temporarily.  StGIT could also\n> unlock the branch permanently if there are no applied patches.\n\nI'm fine with this. At the moment, StGIT does extra checking before\nsome of the commands to ensure that HEAD is the same as the top of the\nstack (i.e. no commits were generated outside stg commands). While\nI'll probably still keep this check, the addition would be useful for\npeople mixing GIT and StGIT commands (I personally try to stay with\nStGIT commands as much as possible).\n\n-- \nCatalin\n"}]}