From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
"brian m . carlson" <sandals@crustytoothpaste.net>
Subject: [PATCH v2 2/3] setup: do not use invalid `repository_format`
Date: Mon, 14 Jan 2019 19:34:56 +0100 [thread overview]
Message-ID: <a7e58385290e6789105d2d5b794f4bf8607285dd.1547488709.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1547488709.git.martin.agren@gmail.com>
If `read_repository_format()` encounters an error, `format->version`
will be -1 and all other fields of `format` will be undefined. However,
in `setup_git_directory_gently()`, we use `repo_fmt.hash_algo`
regardless of the value of `repo_fmt.version`.
This can be observed by adding this to the end of
`read_repository_format()`:
if (format->version == -1)
format->hash_algo = 0; /* no-one should peek at this! */
This causes, e.g., "git branch -m q q2 without config should succeed" in
t3200 to fail with "fatal: Failed to resolve HEAD as a valid ref."
because it has moved .git/config out of the way and is now trying to use
a bad hash algorithm.
Check that `version` is non-negative before using `hash_algo`.
This patch adds no tests, but do note that if we skip this patch, the
next patch would cause existing tests to fail as outlined above.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.c b/setup.c
index bb633942bb..4d3d67c50b 100644
--- a/setup.c
+++ b/setup.c
@@ -1140,7 +1140,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
gitdir = DEFAULT_GIT_DIR_ENVIRONMENT;
setup_git_env(gitdir);
}
- if (startup_info->have_repository)
+ if (startup_info->have_repository && repo_fmt.version > -1)
repo_set_hash_algo(the_repository, repo_fmt.hash_algo);
}
--
2.20.1
next prev parent reply other threads:[~2019-01-14 18:35 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-18 7:25 [PATCH 0/3] setup: add `clear_repository_format()` Martin Ågren
2018-12-18 7:25 ` [PATCH 1/3] setup: drop return value from `read_repository_format()` Martin Ågren
2018-12-19 15:27 ` Jeff King
2018-12-19 21:42 ` Martin Ågren
2018-12-20 0:17 ` brian m. carlson
2018-12-20 2:52 ` Jeff King
2018-12-20 3:45 ` brian m. carlson
2018-12-20 14:53 ` Jeff King
2018-12-18 7:25 ` [PATCH 2/3] setup: do not use invalid `repository_format` Martin Ågren
2018-12-19 0:18 ` brian m. carlson
2018-12-19 21:43 ` Martin Ågren
2018-12-19 15:38 ` Jeff King
2018-12-19 21:46 ` Martin Ågren
2018-12-19 23:17 ` Jeff King
2018-12-20 0:21 ` brian m. carlson
2018-12-18 7:25 ` [PATCH 3/3] setup: add `clear_repository_format()` Martin Ågren
2018-12-19 15:48 ` Jeff King
2018-12-19 21:49 ` Martin Ågren
2019-01-14 18:34 ` [PATCH v2 0/3] " Martin Ågren
2019-01-14 18:34 ` [PATCH v2 1/3] setup: free old value before setting `work_tree` Martin Ågren
2019-01-14 18:34 ` Martin Ågren [this message]
2019-01-15 19:31 ` [PATCH v2 2/3] setup: do not use invalid `repository_format` Jeff King
2019-01-17 6:31 ` Martin Ågren
2019-01-22 7:07 ` Jeff King
2019-01-22 13:34 ` Martin Ågren
2019-01-22 21:45 ` [PATCH v3 0/2] setup: fix memory leaks with `struct repository_format` Martin Ågren
2019-01-22 21:45 ` [PATCH v3 1/2] setup: free old value before setting `work_tree` Martin Ågren
2019-01-22 21:45 ` [PATCH v3 2/2] setup: fix memory leaks with `struct repository_format` Martin Ågren
2019-01-23 5:57 ` Jeff King
2019-01-24 0:14 ` brian m. carlson
2019-01-25 19:25 ` Martin Ågren
2019-01-25 19:24 ` Martin Ågren
2019-01-25 19:51 ` Jeff King
2019-02-25 19:21 ` Martin Ågren
2019-02-26 17:46 ` Jeff King
2019-02-28 20:36 ` [PATCH v4 0/2] " Martin Ågren
2019-02-28 20:36 ` [PATCH v4 1/2] setup: free old value before setting `work_tree` Martin Ågren
2019-02-28 20:36 ` [PATCH v4 2/2] setup: fix memory leaks with `struct repository_format` Martin Ågren
2019-03-06 4:56 ` [PATCH v4 0/2] " Jeff King
2019-01-14 18:34 ` [PATCH v2 3/3] setup: add `clear_repository_format()` Martin Ågren
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=a7e58385290e6789105d2d5b794f4bf8607285dd.1547488709.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/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).