From: Joshua Hudson <jhudson@cedaron•com>
To: git@vger•kernel.org
Subject: Design issue in git merge driver interface
Date: Thu, 22 Jun 2023 09:50:01 -0700 [thread overview]
Message-ID: <6e1b9ce4-e86d-fe30-e5de-27a3be57eefd@cedaron.com> (raw)
We had a major incident here involving bad merges. It was traced to a
problem with a custom merge driver.
On studying why the merge driver failed, we found it was in an
unrunnable state (the logical equivalent of calling abort()) and could
not mark files as conflicted. Since the users were using a graphical
frontend the error messages disappeared into the bitbucket.
I've come to the definite conclusion that treating the file as
conflicted was wrong and the merge needed to bail out in the middle as
though git merge itself bombed. But there doesn't seem to be any way in
the protocol to actually do it.
Looking at the merge driver found that some things cannot be handled,
such as OOM condition. The fault has to propagate upwards, unwinding as
it goes.
next reply other threads:[~2023-06-22 16:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 16:50 Joshua Hudson [this message]
2023-06-22 19:12 ` Design issue in git merge driver interface Junio C Hamano
2023-06-23 0:33 ` [PATCH] ll-merge: killing the external merge driver aborts the merge Junio C Hamano
2023-06-23 6:25 ` Elijah Newren
2023-06-23 16:26 ` Junio C Hamano
2023-06-23 23:31 ` Junio C Hamano
2023-06-25 13:40 ` Joshua Hudson
2023-06-27 12:02 ` Johannes Schindelin
2023-06-27 13:43 ` Joshua Hudson
2023-06-27 19:08 ` Junio C Hamano
2023-06-27 19:10 ` Joshua Hudson
2023-06-27 20:04 ` Junio C Hamano
2023-06-27 21:14 ` Joshua Hudson
2023-06-27 21:26 ` Junio C Hamano
2023-06-27 21:32 ` Joshua Hudson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e1b9ce4-e86d-fe30-e5de-27a3be57eefd@cedaron.com \
--to=jhudson@cedaron$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox