development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

match-trees.h: move declarations for match-trees.c functions from cache.h

Browse source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2023-04-22 20:17:15 +00:00 committed by Junio C Hamano
parent b388633c5c
commit d4ff2072ab
6 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cache.h
View file

@ -603,10 +603,6 @@ int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int
/* diff.c */ /* diff.c */
extern int diff_auto_refresh_index; extern int diff_auto_refresh_index;
/* match-trees.c */
void shift_tree(struct repository *, const struct object_id *, const struct object_id *, struct object_id *, int);
void shift_tree_by(struct repository *, const struct object_id *, const struct object_id *, struct object_id *, const char *);
/* /*
* whitespace rules. * whitespace rules.
* used by both diff and apply * used by both diff and apply

1
match-trees.c
View file

@ -1,5 +1,6 @@
#include "cache.h" #include "cache.h"
#include "hex.h" #include "hex.h"
#include "match-trees.h"
#include "tree.h" #include "tree.h"
#include "tree-walk.h" #include "tree-walk.h"
#include "object-store.h" #include "object-store.h"

10
match-trees.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef MATCH_TREES_H
#define MATCH_TREES_H
struct object_id;
struct repository;
void shift_tree(struct repository *, const struct object_id *, const struct object_id *, struct object_id *, int);
void shift_tree_by(struct repository *, const struct object_id *, const struct object_id *, struct object_id *, const char *);
#endif /* MATCH_TREES_H */

1
merge-ort.c
View file

@ -31,6 +31,7 @@
#include "hex.h" #include "hex.h"
#include "entry.h" #include "entry.h"
#include "ll-merge.h" #include "ll-merge.h"
#include "match-trees.h"
#include "mem-pool.h" #include "mem-pool.h"
#include "object-name.h" #include "object-name.h"
#include "object-store.h" #include "object-store.h"

1
merge-recursive.c
View file

@ -22,6 +22,7 @@
#include "hex.h" #include "hex.h"
#include "ll-merge.h" #include "ll-merge.h"
#include "lockfile.h" #include "lockfile.h"
#include "match-trees.h"
#include "object-file.h" #include "object-file.h"
#include "object-name.h" #include "object-name.h"
#include "object-store.h" #include "object-store.h"

1
t/helper/test-match-trees.c
View file

@ -1,6 +1,7 @@
#include "test-tool.h" #include "test-tool.h"
#include "cache.h" #include "cache.h"
#include "hex.h" #include "hex.h"
#include "match-trees.h"
#include "object-name.h" #include "object-name.h"
#include "setup.h" #include "setup.h"
#include "tree.h" #include "tree.h"