git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Gated Merge?

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 11, 2016, 22:06 UTC
Message-ID
<xmqqvb5uvr40.fsf@gitster.mtv.corp.google.com>

I wish there were a way to let me annotate a commit with a statement like this:

 * When merging a branch that does not have me in it into a trunk
   that already has me, do this extra check on the result of the
   merge before allowing it to be recorded.

For example, suppose there is a topic that changes all instances of this

	__attribute__((format(printf, X, Y)))

into a new macro FORMAT_PRINTF(X, Y). With such a facility, I can annotate the commit at the tip of that series to define an extra check:

   ! git diff HEAD | grep '^+.*__attribute__((format(printf'

which would prevent me from merging a topic that introduces a new instance of the printf-format attribute that is spelled in an old-fashioned way.

In this particular example, it might be even better if the facility allowed me to declare something like this instead:

 * When merging a branch that does not have me in it into a trunk
   that already has me, do this extra processing on the result of
   the merge before recording it.

The difference between them is the "extra processing" part. For this example, it would be something that is built around:

    perl -p -e '
        s{__attribute__\(\(format\(\s*printf,\s*(\d+),\s*(\d+)\)\)\)}
         {FORMAT_PRINTF($1, $2)}gx
    '

to update the old-fashioned one to use the new macro, and the result would become an evil merge.

To realize this, there are low-hanging-fruit building blocks that are trivial:

 - Such an annotation can be made as a note attached to the commit
   in question;
 - Such a check can be done in pre-commit hook;
 - Such a pre-commit hook can iterate over this set of commits
    DIFF=$(git rev-list --left-right HEAD...MERGE_HEAD)
    
   collect these Merge Gate annotations from the commit appears on
   the left hand side (e.g. only exists on the trunk that a side
   branch is about to be merged in), and run them.

But the last one feels very costly, and I suspect that there must be a better way to do this. I do not think we want the "what to do" part (i.e. checking new lines for __attribute__ in the first example, or rewriting new lines that has __attribute_ in the second example) to be in git-core; that clearly is outside the scope of the plumbing. But the part that finds these "annotations", especially if we can come up with a fast implementation that may be hard to script, may be a good addition to the plumbing command set.

Thoughts?
Next: Andrew Ardill
Message 1 of 7 in “Gated Merge?”
  1. Junio C HamanoFeb 11, 2016
  2. Andrew ArdillFeb 11, 2016
  3. Stefan BellerFeb 11, 2016
  4. Junio C HamanoFeb 12, 2016
  5. Jeff KingFeb 12, 2016
  6. Junio C HamanoFeb 12, 2016
  7. Jeff KingFeb 12, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.