diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-08 22:14:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-08 22:14:49 (GMT) |
| commit | b1cda70fff238aa8947dc8b527dc4a5f6bd4ede0 (patch) | |
| tree | bbb316ed03593eb48779bb5fa60dbce0c5614161 /Makefile | |
| parent | fa5f2398e5163f855b0a680b0bf704e2c2e7da24 (diff) | |
| parent | 0845122c39c415fa50904ee94c6b60e4e722466b (diff) | |
| download | git-b1cda70fff238aa8947dc8b527dc4a5f6bd4ede0.zip git-b1cda70fff238aa8947dc8b527dc4a5f6bd4ede0.tar.gz git-b1cda70fff238aa8947dc8b527dc4a5f6bd4ede0.tar.bz2 | |
Merge branch 'dt/refs-backend-pre-vtable'
Code preparation for pluggable ref backends.
* dt/refs-backend-pre-vtable:
refs: break out ref conflict checks
files_log_ref_write: new function
initdb: make safe_create_dir public
refs: split filesystem-based refs code into a new file
refs/refs-internal.h: new header file
refname_is_safe(): improve docstring
pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
copy_msg(): rename to copy_reflog_msg()
verify_refname_available(): new function
verify_refname_available(): rename function
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -772,6 +772,7 @@ LIB_OBJS += reachable.o LIB_OBJS += read-cache.o LIB_OBJS += reflog-walk.o LIB_OBJS += refs.o +LIB_OBJS += refs/files-backend.o LIB_OBJS += ref-filter.o LIB_OBJS += remote.o LIB_OBJS += replace_object.o @@ -2432,7 +2433,7 @@ profile-clean: $(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs))) clean: profile-clean coverage-clean - $(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o + $(RM) *.o *.res refs/*.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o $(RM) xdiff/*.o vcs-svn/*.o ewah/*.o builtin/*.o $(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB) $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X |