Some commits may have unusually long subject lines, which can cause git error out. Currently the sequencer and lockfile assumes these to be less than NAME_MAX which is the maximum length of a filename (on Linux). When reproduced one is met by the error message: $ git rebase --continue error: cannot lock ref 'refs/rewritten/SANITIZED-SUBJECT': Unable to create '.git/refs/rewritten/SANITIZED-SUBJECT.lock': File name too long * where SANITIZED-SUBJECT is very long Affected repos can only be salvaged through filter-branch etc. Johannes Schindelin (1): rebase: allow overriding the maximal length of the generated labels Mark Ruvald Pedersen (1): sequencer: truncate labels to accommodate loose refs Documentation/config/rebase.txt | 6 +++++ git-compat-util.h | 4 +++ sequencer.c | 47 ++++++++++++++++++++++++++++----- t/t3430-rebase-merges.sh | 11 ++++++++ 4 files changed, 62 insertions(+), 6 deletions(-) base-commit: a82fb66fed250e16d3010c75404503bea3f0ab61 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1562%2Fmped-oticon%2Fmped_bugfix_lockfile_maxname-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1562/mped-oticon/mped_bugfix_lockfile_maxname-v1 Pull-Request: https://github.com/git/git/pull/1562 -- gitgitgadget