Skip to content

replacement for dt/refs-backend-lmdb v7 patch 04/33

Michael Haggerty git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest21 patches 9 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21t1430: test the output and error of some commands more carefullyt/t1430-bad-ref-name.sh+12 -60 replies
2/21t1430: clean up broken refs/tags/shadowt/t1430-bad-ref-name.sh+1 -10 replies
3/21t1430: don't rely on symbolic-ref for creating broken symrefst/t1430-bad-ref-name.sh+2 -20 replies
4/21t1430: test for-each-ref in the presence of badly-named refst/t1430-bad-ref-name.sh+16 -00 replies
5/21t1430: improve test coverage of deletion of badly-named refst/t1430-bad-ref-name.sh+98 -100 replies
6/21resolve_missing_loose_ref(): simplify semanticsrefs/files-backend.c+10 -140 replies
7/21resolve_ref_unsafe(): use for loop to count up to MAXDEPTHrefs/files-backend.c+6 -70 replies
8/21resolve_ref_unsafe(): ensure flags is always setrefs/files-backend.c+13 -180 replies
9/21resolve_ref_1(): eliminate local variablerefs/files-backend.c+6 -70 replies
10/21resolve_ref_1(): reorder coderefs/files-backend.c+2 -20 replies
11/21resolve_ref_1(): eliminate local variable "bad_name"refs/files-backend.c+5 -80 replies
12/21files-backend: break out ref readingrefs/files-backend.c+145 -990 replies
13/21read_raw_ref(): manage own scratch spacerefs/files-backend.c+41 -350 replies
14/21Inline resolve_ref_1() into resolve_ref_unsafe()refs/files-backend.c+9 -220 replies
15/21read_raw_ref(): change flags parameter to unsigned intrefs/files-backend.c+3 -30 replies
16/21fsck_head_link(): remove unneeded flag variablebuiltin/fsck.c+1 -20 replies
17/21cmd_merge(): remove unneeded flag variablebuiltin/merge.c+2 -20 replies
18/21get_default_remote(): remove unneeded flag variablebuiltin/submodule--helper.c+1 -20 replies
19/21checkout_paths(): remove unneeded flag variablebuiltin/checkout.c+1 -20 replies
20/21check_aliased_update(): check that dst_name is non-NULLbuiltin/receive-pack.c+1 -10 replies
21/21show_head_ref(): check the result of resolve_ref_namespace()http-backend.c+2 -20 replies

Reviews trailers per patch

None of the 21 patches has a Reviewed-by or Acked-by.

PatchDuy Nguyen
1/21
2/21
3/21
4/21
5/21
6/21
7/21
8/21
9/21
10/21
11/21
12/21Helped-by
13/21
14/21
15/21
16/21
17/21
18/21
19/21
20/21
21/21

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/21] replacement for dt/refs-backend-lmdb v7 patch 04/33

Patch 04/33 in David Turner's refs-backend-lmdb series v7 [1] did way too much in a single patch, and in fact got a few minor things wrong. Instead of that patch, I suggest this patch series, which

* Splits the changes into smaller steps.

* Adds a bunch of tests of deleting references with invalid but safe names, including symbolic references and including references reached via symbolic references. Two of these tests fail when run against David's patch 04 due to changes in output.

* Arranges for the "flags" argument to read_raw_ref() always to be non-NULL, which eliminates the need for a lot of "if (flags)" guards.

* Eliminates the now-superfluous "bad_name" local variable.

* Move the management of the scratch space sb_path from resolve_ref_unsafe() to read_raw_ref().

* Inlines resolve_ref_1() into resolve_ref_unsafe().

* Changes some callers of resolve_ref_unsafe() to pass flags=NULL instead of creating a local flags variable that is never used.

* Changes some callers to check for errors before using the return value of resolve_ref_unsafe().

I hope that the result is easier to understand and audit, even though it consists of more patches (indeed, *because* of that).

This patch series applies on top of David's patch 03/33 the same place David applied it in his repo [2]. It is also available in situ from my GitHub repo [3] as branch "pluggable-backends-patch4"

If this series is used, later patches from David's series would need to be rebased on top of it. This is a little bit messy but not difficult; the result can be seen in branch "pluggable-backends-rebased" in my GitHub repo [3] (albeit without adjusting the LMDB-related patches).

Michael

[1] http://article.gmane.org/gmane.comp.version-control.git/287971
[2] https://github.com/dturner-tw/git/tree/dturner/pluggable-backends
[3] https://github.com/mhagger/git

David Turner (1):
files-backend: break out ref reading

Michael Haggerty (20):
t1430: test the output and error of some commands more carefully
t1430: clean up broken refs/tags/shadow
t1430: don't rely on symbolic-ref for creating broken symrefs
t1430: test for-each-ref in the presence of badly-named refs
t1430: improve test coverage of deletion of badly-named refs resolve_missing_loose_ref(): simplify semantics resolve_ref_unsafe(): use for loop to count up to MAXDEPTH resolve_ref_unsafe(): ensure flags is always set resolve_ref_1(): eliminate local variable resolve_ref_1(): reorder code
resolve_ref_1(): eliminate local variable "bad_name" read_raw_ref(): manage own scratch space
Inline resolve_ref_1() into resolve_ref_unsafe() read_raw_ref(): change flags parameter to unsigned int fsck_head_link(): remove unneeded flag variable cmd_merge(): remove unneeded flag variable get_default_remote(): remove unneeded flag variable checkout_paths(): remove unneeded flag variable check_aliased_update(): check that dst_name is non-NULL show_head_ref(): check the result of resolve_ref_namespace()

 builtin/checkout.c          |   3 +-
 builtin/fsck.c              |   3 +-
 builtin/merge.c             |   4 +-
 builtin/receive-pack.c      |   2 +-
 builtin/submodule--helper.c |   3 +-
 http-backend.c              |   4 +-
 refs/files-backend.c        | 341 ++++++++++++++++++++++++--------------------
 t/t1430-bad-ref-name.sh     | 132 +++++++++++++++--
 8 files changed, 312 insertions(+), 180 deletions(-)
Signature · 1 line
2.8.0.rc3