All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Mark Ruvald Pedersen via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Mark Ruvald Pedersen <mped@oticon.com>
Subject: [PATCH 0/2] sequencer: truncate lockfile and ref to NAME_MAX
Date: Thu, 10 Aug 2023 16:34:58 +0000	[thread overview]
Message-ID: <pull.1562.git.git.1691685300.gitgitgadget@gmail.com> (raw)

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

             reply	other threads:[~2023-08-10 16:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-10 16:34 Mark Ruvald Pedersen via GitGitGadget [this message]
2023-08-10 16:34 ` [PATCH 1/2] sequencer: truncate labels to accommodate loose refs Mark Ruvald Pedersen via GitGitGadget
2023-08-10 17:12   ` Junio C Hamano
2023-08-16  8:36     ` Johannes Schindelin
2023-08-16 16:28       ` Junio C Hamano
2023-08-10 16:35 ` [PATCH 2/2] rebase: allow overriding the maximal length of the generated labels Johannes Schindelin via GitGitGadget
2023-08-10 17:15   ` Junio C Hamano

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=pull.1562.git.git.1691685300.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=mped@oticon.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.