git/refs.h, branch v2.15.2

Merge branch 'sd/branch-copy'

2017-10-03T06:42:48Z

"git branch" learned "-c/-C" to create a new branch by copying an existing one. * sd/branch-copy: branch: fix "copy" to never touch HEAD branch: add a --copy (-c) option to go with --move (-m) branch: add test for -m renaming multiple config sections config: create a function to format section headers

Merge branch 'rs/resolve-ref-optional-result'

2017-09-28T05:47:56Z

Code clean-up. * rs/resolve-ref-optional-result: refs: pass NULL to resolve_ref_unsafe() if hash is not needed refs: pass NULL to refs_resolve_ref_unsafe() if hash is not needed refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional

Merge branch 'tg/refs-allowed-flags'

2017-09-25T06:24:07Z

API error-proofing which happens to also squelch warnings from GCC. * tg/refs-allowed-flags: refs: strip out not allowed flags from ref_transaction_update

refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional

2017-09-24T01:18:18Z

Allow callers of refs_resolve_ref_unsafe() to pass NULL if they don't need the resolved hash value. We already allow the same for the flags parameter. This new leniency is inherited by the various wrappers like resolve_ref_unsafe(). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

refs: strip out not allowed flags from ref_transaction_update

2017-09-14T05:46:05Z

Callers are only allowed to pass certain flags into ref_transaction_update, other flags are internal to it. To prevent mistakes from the callers, strip the internal only flags out before continuing. This was noticed because of a compiler warning gcc 7.1.1 issued about passing a NULL parameter as second parameter to memcpy (through hashcpy): In file included from refs.c:5:0: refs.c: In function ‘ref_transaction_verify’: cache.h:948:2: error: argument 2 null where non-null expected [-Werror=nonnull] memcpy(sha_dst, sha_src, GIT_SHA1_RAWSZ); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from git-compat-util.h:165:0, from cache.h:4, from refs.c:5: /usr/include/string.h:43:14: note: in a call to function ‘memcpy’ declared here extern void *memcpy (void *__restrict __dest, const void *__restrict __src, ^~~~~~ The call to hascpy in ref_transaction_add_update is protected by the passed in flags, but as we only add flags there, gcc notices REF_HAVE_NEW or REF_HAVE_OLD flags could be passed in from the outside, which would potentially result in passing in NULL as second parameter to memcpy. Fix both the compiler warning, and make the interface safer for its users by stripping the internal flags out. Suggested-by: Michael Haggerty Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

refs: remove dead for_each_*_submodule()

2017-08-24T21:56:28Z

These are used in revision.c. After the last patch they are replaced with the refs_ version. Delete them. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

refs.c: move for_each_remote_ref_submodule() to submodule.c

2017-08-24T21:56:10Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

revision.c: use refs_for_each() instead of for_each__submodule()

2017-08-24T21:52:33Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

refs: add refs_head_ref()

2017-08-24T21:47:31Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Spelling fixes

2017-06-27T17:35:49Z

Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano

git/refs.h, branch v2.15.2

Merge branch 'sd/branch-copy'

Merge branch 'rs/resolve-ref-optional-result'

Merge branch 'tg/refs-allowed-flags'

refs: make sha1 output parameter of refs_resolve_ref_unsafe() optional

refs: strip out not allowed flags from ref_transaction_update

refs: remove dead for_each_*_submodule()

refs.c: move for_each_remote_ref_submodule() to submodule.c

revision.c: use refs_for_each*() instead of for_each_*_submodule()

refs: add refs_head_ref()

Spelling fixes

revision.c: use refs_for_each() instead of for_each__submodule()