Re: [PATCH 19/20] merge-ort: add implementation of record_conflicted_index_entries()
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Nov 29, 2020, 10:20 UTC
- Message-ID
- <87lfekjwg1.fsf@evledraar.gmail.com>
- In-Reply-To
- <56b162c60993061e29c100ce4a27839d758033b8.1606635803.git.gitgitgadget@gmail.com>
On Sun, Nov 29 2020, Elijah Newren via GitGitGadget wrote:
Show 5 quoted lines
> + if (pos < 0) {
> + if (ci->filemask == 1)
> + cache_tree_invalidate_path(index, path);
> + else
> + BUG("Conflicted %s but nothing in basic working tree or index; this shouldn't happen", path);Trivial style comment: elsewhere in the series you avoid indentation with BUG(...). Would be better here as:
if (x != 1)
BUG(...)
rest_of_code();