From: Matheus Tavares <matheus.bernardino@usp.br>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH v2 0/2] checkout-index: some cleanups to --temp and --prefix outputs
Date: Mon, 15 Feb 2021 15:24:11 -0300 [thread overview]
Message-ID: <cover.1613411136.git.matheus.bernardino@usp.br> (raw)
In-Reply-To: <cover.1612812581.git.matheus.bernardino@usp.br>
Changes since v1:
- Added regression tests in first patch.
- Left the `topath[]` cleanup outside the if block on patch 2, to make
it easier to read.
Matheus Tavares (2):
write_entry(): fix misuses of `path` in error messages
checkout-index: omit entries with no tempname from --temp output
builtin/checkout-index.c | 35 ++++++++++++++++++++++-----------
entry.c | 8 ++++----
t/t2006-checkout-index-basic.sh | 23 ++++++++++++++++++++++
3 files changed, 51 insertions(+), 15 deletions(-)
Range-diff against v1:
1: d52bcad326 ! 1: bdda5f99d0 write_entry(): fix misuses of `path` in error messages
@@ Commit message
writing to a tempfile. (In fact, `path` will be either empty or dirty
when writing to a tempfile.) Therefore, these variables cannot be used
interchangeably. In this sense, fix wrong uses of `path` in error
- messages where it should really be `ce->name`. (There doesn't seem to be
- any misuse in the other way around.)
+ messages where it should really be `ce->name`, and add some regression
+ tests. (Note: there doesn't seem to be any misuse in the other way
+ around.)
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
@@ entry.c: static int write_entry(struct cache_entry *ce,
}
finish:
+
+ ## t/t2006-checkout-index-basic.sh ##
+@@ t/t2006-checkout-index-basic.sh: test_expect_success 'checkout-index reports errors (stdin)' '
+ test_i18ngrep not.in.the.cache stderr
+ '
+
++test_expect_success 'checkout-index --temp correctly reports error on missing blobs' '
++ test_when_finished git reset --hard &&
++ missing_blob=$(git hash-object --stdin </dev/null) &&
++ cat >objs <<-EOF &&
++ 100644 $missing_blob file
++ 120000 $missing_blob symlink
++ EOF
++ git update-index --index-info <objs &&
++
++ test_must_fail git checkout-index --temp symlink file 2>stderr &&
++ test_i18ngrep "unable to read sha1 file of file ($missing_blob)" stderr &&
++ test_i18ngrep "unable to read sha1 file of symlink ($missing_blob)" stderr
++'
++
++test_expect_success 'checkout-index --temp correctly reports error for submodules' '
++ git init sub &&
++ test_commit -C sub file &&
++ git submodule add ./sub &&
++ git commit -m sub &&
++ test_must_fail git checkout-index --temp sub 2>stderr &&
++ test_i18ngrep "cannot create temporary submodule sub" stderr
++'
++
+ test_done
2: 1275701345 ! 2: 6ece1947c1 checkout-index: omit entries with no tempname from --temp output
@@ builtin/checkout-index.c: static struct checkout state = CHECKOUT_INIT;
+ putchar('\t');
+ write_name_quoted_relative(name, prefix, stdout,
+ nul_term_line ? '\0' : '\n');
++ }
-- for (i = 0; i < 4; i++) {
-- topath[i][0] = 0;
-+ for (i = 0; i < 4; i++) {
-+ topath[i][0] = 0;
-+ }
- }
- }
-
+ for (i = 0; i < 4; i++) {
+ topath[i][0] = 0;
--
2.29.2
next prev parent reply other threads:[~2021-02-15 18:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 19:36 [PATCH 0/2] checkout-index: some cleanups to --temp and --prefix outputs Matheus Tavares
2021-02-08 19:36 ` [PATCH 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-09 21:27 ` Junio C Hamano
2021-02-09 23:59 ` Matheus Tavares Bernardino
2021-02-08 19:36 ` [PATCH 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares
2021-02-09 21:35 ` Junio C Hamano
2021-02-09 21:57 ` Matheus Tavares Bernardino
2021-02-10 1:07 ` Junio C Hamano
2021-02-15 18:24 ` Matheus Tavares [this message]
2021-02-15 18:24 ` [PATCH v2 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-16 2:26 ` Junio C Hamano
2021-02-15 18:24 ` [PATCH v2 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares
2021-02-16 14:06 ` [PATCH v3 0/2] checkout-index: some cleanups to --temp and --prefix outputs Matheus Tavares
2021-02-16 14:06 ` [PATCH v3 1/2] write_entry(): fix misuses of `path` in error messages Matheus Tavares
2021-02-16 14:06 ` [PATCH v3 2/2] checkout-index: omit entries with no tempname from --temp output Matheus Tavares
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=cover.1613411136.git.matheus.bernardino@usp.br \
--to=matheus.bernardino@usp.br \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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 NNTP newsgroup(s).