git/refs.c, branch v2.16.2

log: add option to choose which refs to decorate

2017-11-22T04:18:59Z

When `log --decorate` is used, git will decorate commits with all available refs. While in most cases this may give the desired effect, under some conditions it can lead to excessively verbose output. Introduce two command line options, `--decorate-refs=` and `--decorate-refs-exclude=` to allow the user to select which refs are used in decoration. When "--decorate-refs=" is given, only the refs that match the pattern are used in decoration. The refs that match the pattern when "--decorate-refs-exclude=" is given, are never used in decoration. These options follow the same convention for mixing negative and positive patterns across the system, assuming that the inclusive default is to match all refs available. (1) if there is no positive pattern given, pretend as if an inclusive default positive pattern was given; (2) for each candidate, reject it if it matches no positive pattern, or if it matches any one of the negative patterns. The rules for what is considered a match are slightly different from the rules used elsewhere. Commands like `log --glob` assume a trailing '/*' when glob chars are not present in the pattern. This makes it difficult to specify a single ref. On the other hand, commands like `describe --match --all` allow specifying exact refs, but do not have the convenience of allowing "shorthand refs" like 'refs/heads' or 'heads' to refer to 'refs/heads/*'. The commands introduced in this patch consider a match if: (a) the pattern contains globs chars, and regular pattern matching returns a match. (b) the pattern does not contain glob chars, and ref '' exists, or if ref exists under '/' This allows both behaviours (allowing single refs and shorthand refs) yet remaining compatible with existent commands. Helped-by: Kevin Daudt Helped-by: Junio C Hamano Signed-off-by: Rafael Ascensão Signed-off-by: Junio C Hamano

refs: update some more docs to use "oid" rather than "sha1"

2017-11-06T01:31:08Z

Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

ref_transaction_add_update(): remove a check

2017-11-06T01:31:07Z

We want to make `REF_ISPRUNING` internal to the files backend. For this to be possible, `ref_transaction_add_update()` mustn't know about it. So move the check that `REF_ISPRUNING` is only used with `REF_NODEREF` from this function to `files_transaction_prepare()`. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

ref_transaction_update(): die on disallowed flags

2017-11-06T01:31:07Z

Callers shouldn't be passing disallowed flags into `ref_transaction_update()`. So instead of masking them off, treat it as a bug if any are set. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

refs: convert read_raw_ref backends to struct object_id

2017-10-16T02:05:52Z

Convert the unsigned char * parameter to struct object_id * for files_read_raw_ref and packed_read_raw_ref. Update the documentation. Switch from using get_sha1_hex and a hard-coded 40 to using parse_oid_hex. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

refs: convert peel_object to struct object_id

2017-10-16T02:05:52Z

Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

refs: convert resolve_ref_unsafe to struct object_id

2017-10-16T02:05:51Z

Convert resolve_ref_unsafe to take a pointer to struct object_id by converting one remaining caller to use struct object_id, removing the temporary NULL pointer check in expand_ref, converting the declaration and definition, and applying the following semantic patch: @@ expression E1, E2, E3, E4; @@ - resolve_ref_unsafe(E1, E2, E3.hash, E4) + resolve_ref_unsafe(E1, E2, &E3, E4) @@ expression E1, E2, E3, E4; @@ - resolve_ref_unsafe(E1, E2, E3->hash, E4) + resolve_ref_unsafe(E1, E2, E3, E4) Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

refs: convert resolve_gitlink_ref to struct object_id

2017-10-16T02:05:51Z

Convert the declaration and definition of resolve_gitlink_ref to use struct object_id and apply the following semantic patch: @@ expression E1, E2, E3; @@ - resolve_gitlink_ref(E1, E2, E3.hash) + resolve_gitlink_ref(E1, E2, &E3) @@ expression E1, E2, E3; @@ - resolve_gitlink_ref(E1, E2, E3->hash) + resolve_gitlink_ref(E1, E2, E3) Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

refs: convert reflog_expire parameter to struct object_id

2017-10-16T02:05:51Z

reflog_expire already used struct object_id internally, but it did not take it as a parameter. Adjust the parameter (and the callers) to pass a pointer to struct object_id instead of a pointer to unsigned char. Remove the temporary inserted earlier as it is no longer required. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

refs: convert read_ref_at to struct object_id

2017-10-16T02:05:51Z

Convert the callers and internals, including struct read_ref_at_cb, of read_ref_at to use struct object_id. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano