git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Calum McConnell <calumlikesapplepie@gmail.com>
To: git@vger.kernel.org
Cc: Calum McConnell <calumlikesapplepie@gmail.com>
Subject: [PATCH 2/3] Die if filter is attempted without a worktree
Date: Mon,  6 Sep 2021 14:10:01 -0400	[thread overview]
Message-ID: <20210906181002.625647-2-calumlikesapplepie@gmail.com> (raw)
In-Reply-To: <20210906181002.625647-1-calumlikesapplepie@gmail.com>

As far as I know, this isn't possible.  Rather than add a bunch of
code to workarround something that might not be possible, lets just
halt and catch fire if it does.  This might need to be removed before
the change goes into master

Signed-off-by: Calum McConnell <calumlikesapplepie@gmail.com>
---
 convert.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/convert.c b/convert.c
index 5d64ccce57..df70c250b0 100644
--- a/convert.c
+++ b/convert.c
@@ -646,6 +646,11 @@ static int filter_buffer_or_fd(int in, int out, void *data)
 	sq_quote_buf(&worktreePath, the_repository->worktree);
 	dict[1].value = worktreePath.buf;
 
+	/* The results of a nonexistent worktree could be... weird.  Lets avoid*/
+	if(dict[1].value == NULL){
+		BUG("There is no worktree for this worktree substitution");
+	}
+
 	/* expand all %f or %w with the quoted path */
 	strbuf_expand(&cmd, params->cmd, strbuf_expand_dict_cb, &dict);
 	strbuf_release(&filePath);
-- 
2.30.2


  reply	other threads:[~2021-09-06 18:10 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-06 18:10 [PATCH 1/3] Add support for new %w wildcard in checkout filter Calum McConnell
2021-09-06 18:10 ` Calum McConnell [this message]
2021-09-06 22:09   ` [PATCH 2/3] Die if filter is attempted without a worktree Ævar Arnfjörð Bjarmason
2021-09-07 14:56     ` Calum McConnell
2021-09-07  8:18   ` Bagas Sanjaya
2021-09-06 18:10 ` [PATCH 3/3] Document the new gitattributes change Calum McConnell
2021-09-07 16:33 ` [PATCH 1/3] Add support for new %w wildcard in checkout filter Jeff King
2021-09-07 20:28 ` 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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210906181002.625647-2-calumlikesapplepie@gmail.com \
    --to=calumlikesapplepie@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).