summaryrefslogtreecommitdiff
path: root/git-gui/po/po2msg.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-01-21 16:58:30 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-21 17:04:50 -0800
commit519947b69a9ea1461d5f5afc762823835295b3b2 (patch)
tree82e241bb271ab51db1f0aad8a98b10893ecd2762 /git-gui/po/po2msg.sh
parentcheckout: fix "branch info" memory leaks (diff)
downloadtgif-519947b69a9ea1461d5f5afc762823835295b3b2.tar.xz
checkout: avoid BUG() when hitting a broken repository
When 9081a421 (checkout: fix "branch info" memory leaks, 2021-11-16) cleaned up existing memory leaks, we added an unrelated sanity check to ensure that a local branch is truly local and not a symref to elsewhere that dies with BUG() otherwise. This was misguided in two ways. First of all, such a tightening did not belong to a leak-fix patch. And the condition it detected was *not* a bug in our program but a problem in user data, where warning() or die() would have been more appropriate. As the condition is not fatal (the result of computing the local branch name in the code that is involved in the faulty check is only used as a textual label for the commit), let's revert the code to the original state, i.e. strip "refs/heads/" to compute the local branch name if possible, and otherwise leave it NULL. The consumer of the information in merge_working_tree() is prepared to see NULL in there and act accordingly. cf. https://bugzilla.redhat.com/show_bug.cgi?id=2042920 Reported-by: Petr Šplíchal <psplicha@redhat.com> Reported-by: Todd Zullinger <tmz@pobox.com> Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/po/po2msg.sh')
0 files changed, 0 insertions, 0 deletions