diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-02-28 09:44:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-29 08:06:01 -0800 |
| commit | 896a0e11f37687fb3d40c0aa2b28062264232823 (patch) | |
| tree | d5d22bcfa5e701befbe92fb78d8f48a3e194ebe2 /merge-recursive.c | |
| parent | commit-reach(paint_down_to_common): prepare for handling shallow commits (diff) | |
| download | git-896a0e11f37687fb3d40c0aa2b28062264232823.tar.gz git-896a0e11f37687fb3d40c0aa2b28062264232823.zip | |
commit-reach(paint_down_to_common): start reporting errors
If a commit cannot be parsed, it is currently ignored when looking for
merge bases. That's undesirable as the operation can pretend success in
a corrupt repository, even though the command should fail with an error
message.
Let's start at the bottom of the stack by teaching the
`paint_down_to_common()` function to return an `int`: if negative, it
indicates fatal error, if 0 success.
This requires a couple of callers to be adjusted accordingly.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions