diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:17 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:17 -0700 |
commit | be9cb560e31c76c00760dadb151b5e3059970586 (patch) | |
tree | 434003cf022bccf7f1a1dfecfb77305214defe32 /builtin/log.c | |
parent | Merge branch 'pt/pull-builtin' (diff) | |
parent | delete_ref(): use the usual convention for old_sha1 (diff) | |
download | tgif-be9cb560e31c76c00760dadb151b5e3059970586.tar.xz |
Merge branch 'mh/init-delete-refs-api'
Clean up refs API and make "git clone" less intimate with the
implementation detail.
* mh/init-delete-refs-api:
delete_ref(): use the usual convention for old_sha1
cmd_update_ref(): make logic more straightforward
update_ref(): don't read old reference value before delete
check_branch_commit(): make first parameter const
refs.h: add some parameter names to function declarations
refs: move the remaining ref module declarations to refs.h
initial_ref_transaction_commit(): check for ref D/F conflicts
initial_ref_transaction_commit(): check for duplicate refs
refs: remove some functions from the module's public interface
initial_ref_transaction_commit(): function for initial ref creation
repack_without_refs(): make function private
prune_refs(): use delete_refs()
prune_remote(): use delete_refs()
delete_refs(): bail early if the packed-refs file cannot be rewritten
delete_refs(): make error message more generic
delete_refs(): new function for the refs API
delete_ref(): handle special case more explicitly
remove_branches(): remove temporary
delete_ref(): move declaration to refs.h
Diffstat (limited to 'builtin/log.c')
-rw-r--r-- | builtin/log.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index 878104943f..93025d08cd 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -5,6 +5,7 @@ * 2006 Junio Hamano */ #include "cache.h" +#include "refs.h" #include "color.h" #include "commit.h" #include "diff.h" |