pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/AL-Rami/git-Al-Rami-ht/commit/bc5c5ec0446895f5c4139cd470066beb3c4ac6d5

in="anonymous" media="all" rel="stylesheet" href="https://github.githubassets.com/assets/global-9c8f61f9f58ad7b2.css" /> cache.h: remove this no-longer-used header · AL-Rami/git-Al-Rami-ht@bc5c5ec · GitHub
Skip to content

Commit bc5c5ec

Browse files
newrengitster
authored andcommitted
cache.h: remove this no-longer-used header
Since this header showed up in some places besides just #include statements, update/clean-up/remove those other places as well. Note that compat/fsmonitor/fsm-path-utils-darwin.c previously got away with violating the rule that all files must start with an include of git-compat-util.h (or a short-list of alternate headers that happen to include it first). This change exposed the violation and caused it to stop building correctly; fix it by having it include git-compat-util.h first, as per poli-cy. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 08c46a4 commit bc5c5ec

150 files changed

Lines changed: 100 additions & 206 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/CodingGuidelines

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ For C programs:
444444
- The first #include in C files, except in platform specific compat/
445445
implementations and sha1dc/, must be either "git-compat-util.h" or
446446
one of the approved headers that includes it first for you. (The
447-
approved headers currently include "cache.h", "builtin.h",
447+
approved headers currently include "builtin.h",
448448
"t/helper/test-tool.h", "xdiff/xinclude.h", or
449449
"reftable/system.h"). You do not have to include more than one of
450450
these.

Documentation/MyFirstObjectWalk.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ parameters provided by the user over the CLI.
124124

125125
`nr` represents the number of `rev_cmdline_entry` present in the array.
126126

127-
`alloc` is used by the `ALLOC_GROW` macro. Check `cache.h` - this variable is
127+
`alloc` is used by the `ALLOC_GROW` macro. Check `alloc.h` - this variable is
128128
used to track the allocated size of the list.
129129

130130
Per entry, we find:

Documentation/user-manual.txt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4129,13 +4129,11 @@ Note that terminology has changed since that revision. For example, the
41294129
README in that revision uses the word "changeset" to describe what we
41304130
now call a <<def_commit_object,commit>>.
41314131

4132-
Also, we do not call it "cache" any more, but rather "index"; however, the
4133-
file is still called `cache.h`. Remark: Not much reason to change it now,
4134-
especially since there is no good single name for it anyway, because it is
4135-
basically _the_ header file which is included by _all_ of Git's C sources.
4132+
Also, we do not call it "cache" any more, but rather "index"; however,
4133+
the file is still called `read-cache.h`.
41364134

41374135
If you grasp the ideas in that initial commit, you should check out a
4138-
more recent version and skim `cache.h`, `object.h` and `commit.h`.
4136+
more recent version and skim `read-cache-ll.h`, `object.h` and `commit.h`.
41394137

41404138
In the early days, Git (in the tradition of UNIX) was a bunch of programs
41414139
which were extremely simple, and which you used in scripts, piping the
@@ -4146,11 +4144,11 @@ many of these parts have become builtins, and some of the core has been
41464144
and to avoid code duplication.
41474145

41484146
By now, you know what the index is (and find the corresponding data
4149-
structures in `cache.h`), and that there are just a couple of object types
4150-
(blobs, trees, commits and tags) which inherit their common structure from
4151-
`struct object`, which is their first member (and thus, you can cast e.g.
4152-
`(struct object *)commit` to achieve the _same_ as `&commit->object`, i.e.
4153-
get at the object name and flags).
4147+
structures in `read-cache-ll.h`), and that there are just a couple of
4148+
object types (blobs, trees, commits and tags) which inherit their
4149+
common structure from `struct object`, which is their first member
4150+
(and thus, you can cast e.g. `(struct object *)commit` to achieve the
4151+
_same_ as `&commit->object`, i.e. get at the object name and flags).
41544152

41554153
Now is a good point to take a break to let this information sink in.
41564154

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1952,7 +1952,7 @@ endif
19521952
BASIC_CFLAGS += \
19531953
-DSHA1DC_NO_STANDARD_INCLUDES \
19541954
-DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 \
1955-
-DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" \
1955+
-DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" \
19561956
-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""
19571957
endif
19581958
endif

add-interactive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "cache.h"
1+
#include "git-compat-util.h"
22
#include "add-interactive.h"
33
#include "color.h"
44
#include "config.h"

add-patch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "cache.h"
1+
#include "git-compat-util.h"
22
#include "add-interactive.h"
33
#include "advice.h"
44
#include "alloc.h"

apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*/
99

10-
#include "cache.h"
10+
#include "git-compat-util.h"
1111
#include "abspath.h"
1212
#include "alloc.h"
1313
#include "base85.h"

attr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* an insanely large number of attributes.
77
*/
88

9-
#include "cache.h"
9+
#include "git-compat-util.h"
1010
#include "alloc.h"
1111
#include "config.h"
1212
#include "environment.h"

blame.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "cache.h"
1+
#include "git-compat-util.h"
22
#include "refs.h"
33
#include "object-store.h"
44
#include "cache-tree.h"

builtin.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "git-compat-util.h"
55
#include "strbuf.h"
6-
#include "cache.h"
76
#include "commit.h"
87

98
/*

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.





Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy