]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git-update-index.txt
dir: simplify untracked cache "ident" field
[thirdparty/git.git] / Documentation / git-update-index.txt
CommitLineData
215a7ad1 1git-update-index(1)
2cf565c5 2===================
2cf565c5
DG
3
4NAME
5----
c3f0baac 6git-update-index - Register file contents in the working tree to the index
2cf565c5
DG
7
8
9SYNOPSIS
10--------
f9666adf 11[verse]
b1889c36 12'git update-index'
de5f2bf3
MK
13 [--add] [--remove | --force-remove] [--replace]
14 [--refresh] [-q] [--unmerged] [--ignore-missing]
ec160ae1 15 [(--cacheinfo <mode>,<object>,<file>)...]
5773c9f2 16 [--chmod=(+|-)x]
0460ed2c
FC
17 [--[no-]assume-unchanged]
18 [--[no-]skip-worktree]
5fdeacb0 19 [--ignore-submodules]
bc497127 20 [--[no-]split-index]
eaab83d0 21 [--[no-|test-|force-]untracked-cache]
7099c9c7 22 [--really-refresh] [--unresolve] [--again | -g]
14470c0d 23 [--info-only] [--index-info]
69dec66b 24 [-z] [--stdin] [--index-version <n>]
14470c0d 25 [--verbose]
0adda936 26 [--] [<file>...]
2cf565c5
DG
27
28DESCRIPTION
29-----------
30Modifies the index or directory cache. Each file mentioned is updated
5f3aa197 31into the index and any 'unmerged' or 'needs updating' state is
2cf565c5
DG
32cleared.
33
5162e697 34See also linkgit:git-add[1] for a more user-friendly way to do some of
e701ccc3
MM
35the most common operations on the index.
36
0b444cdb 37The way 'git update-index' handles files it is told about can be modified
2cf565c5
DG
38using the various options:
39
40OPTIONS
41-------
42--add::
5f3aa197 43 If a specified file isn't in the index already then it's
2cf565c5
DG
44 added.
45 Default behaviour is to ignore new files.
46
47--remove::
5f3aa197 48 If a specified file is in the index but is missing then it's
2cf565c5 49 removed.
abda1ef5 50 Default behavior is to ignore removed file.
2cf565c5
DG
51
52--refresh::
5f3aa197 53 Looks at the current index and checks to see if merges or
2cf565c5
DG
54 updates are needed by checking stat() information.
55
14470c0d 56-q::
5f3aa197 57 Quiet. If --refresh finds that the index needs an update, the
14470c0d 58 default behavior is to error out. This option makes
0b444cdb 59 'git update-index' continue anyway.
14470c0d 60
04c8ce9c 61--ignore-submodules::
5fdeacb0
JS
62 Do not try to update submodules. This option is only respected
63 when passed before --refresh.
64
14470c0d 65--unmerged::
5f3aa197 66 If --refresh finds unmerged changes in the index, the default
0b444cdb 67 behavior is to error out. This option makes 'git update-index'
14470c0d
CS
68 continue anyway.
69
2cf565c5
DG
70--ignore-missing::
71 Ignores missing files during a --refresh
72
ec160ae1 73--cacheinfo <mode>,<object>,<path>::
2cf565c5 74--cacheinfo <mode> <object> <path>::
ec160ae1
JH
75 Directly insert the specified info into the index. For
76 backward compatibility, you can also give these three
77 arguments as three separate parameters, but new users are
78 encouraged to use a single-parameter form.
a6080a0a 79
14470c0d 80--index-info::
7acab8f1 81 Read index information from stdin.
14470c0d
CS
82
83--chmod=(+|-)x::
a6080a0a 84 Set the execute permissions on the updated files.
14470c0d 85
0460ed2c 86--[no-]assume-unchanged::
ccadb25f
PO
87 When this flag is specified, the object names recorded
88 for the paths are not updated. Instead, this option
89 sets/unsets the "assume unchanged" bit for the
90 paths. When the "assume unchanged" bit is on, the user
91 promises not to change the file and allows Git to assume
92 that the working tree file matches what is recorded in
93 the index. If you want to change the working tree file,
94 you need to unset the bit to tell Git. This is
f9666adf
JH
95 sometimes helpful when working with a big project on a
96 filesystem that has very slow lstat(2) system call
97 (e.g. cifs).
6259ac66 98+
6259ac66
PB
99Git will fail (gracefully) in case it needs to modify this file
100in the index e.g. when merging in a commit;
101thus, in case the assumed-untracked file is changed upstream,
102you will need to handle the situation manually.
f9666adf 103
466d1f15
ŠN
104--really-refresh::
105 Like '--refresh', but checks stat information unconditionally,
106 without regard to the "assume unchanged" setting.
107
0460ed2c 108--[no-]skip-worktree::
44a36913
NTND
109 When one of these flags is specified, the object name recorded
110 for the paths are not updated. Instead, these options
111 set and unset the "skip-worktree" bit for the paths. See
112 section "Skip-worktree bit" below for more information.
113
3240240f
SB
114-g::
115--again::
0b444cdb 116 Runs 'git update-index' itself on the paths whose index
83e77a25
JH
117 entries are different from those from the `HEAD` commit.
118
060729dd
MK
119--unresolve::
120 Restores the 'unmerged' or 'needs updating' state of a
121 file during a merge if it was cleared by accident.
122
df6e1516
BL
123--info-only::
124 Do not create objects in the object database for all
125 <file> arguments that follow this flag; just insert
5f3aa197 126 their object IDs into the index.
df6e1516 127
2cf565c5
DG
128--force-remove::
129 Remove the file from the index even when the working directory
9b63f501 130 still has such a file. (Implies --remove.)
2cf565c5
DG
131
132--replace::
133 By default, when a file `path` exists in the index,
0b444cdb 134 'git update-index' refuses an attempt to add `path/file`.
2cf565c5
DG
135 Similarly if a file `path/file` exists, a file `path`
136 cannot be added. With --replace flag, existing entries
04c8ce9c 137 that conflict with the entry being added are
2cf565c5
DG
138 automatically removed with warning messages.
139
1f7f99de
JH
140--stdin::
141 Instead of taking list of paths from the command line,
142 read list of paths from the standard input. Paths are
143 separated by LF (i.e. one path per line) by default.
144
14470c0d
CS
145--verbose::
146 Report what is being added and removed from index.
147
69dec66b
JH
148--index-version <n>::
149 Write the resulting index out in the named on-disk format version.
647d8794
NTND
150 Supported versions are 2, 3 and 4. The current default version is 2
151 or 3, depending on whether extra features are used, such as
152 `git add -N`.
153+
154Version 4 performs a simple pathname compression that reduces index
155size by 30%-50% on large repositories, which results in faster load
156time. Version 4 is relatively young (first released in in 1.8.0 in
157October 2012). Other Git implementations such as JGit and libgit2
158may not support it yet.
69dec66b 159
1f7f99de 160-z::
537497be
BW
161 Only meaningful with `--stdin` or `--index-info`; paths are
162 separated with NUL character instead of LF.
1f7f99de 163
c18b80a0
NTND
164--split-index::
165--no-split-index::
166 Enable or disable split index mode. If enabled, the index is
167 split into two files, $GIT_DIR/index and $GIT_DIR/sharedindex.<SHA-1>.
168 Changes are accumulated in $GIT_DIR/index while the shared
169 index file contains all index entries stays unchanged. If
170 split-index mode is already enabled and `--split-index` is
171 given again, all changes in $GIT_DIR/index are pushed back to
172 the shared index file. This mode is designed for very large
f745acb0 173 indexes that take a significant amount of time to read or write.
c18b80a0 174
9e597241
NTND
175--untracked-cache::
176--no-untracked-cache::
177 Enable or disable untracked cache extension. This could speed
178 up for commands that involve determining untracked files such
179 as `git status`. The underlying operating system and file
180 system must change `st_mtime` field of a directory if files
181 are added or deleted in that directory.
182
eaab83d0
CC
183--test-untracked-cache::
184 Only perform tests on the working directory to make sure
185 untracked cache can be used. You have to manually enable
186 untracked cache using `--force-untracked-cache` (or
187 `--untracked-cache` but this will run the tests again)
188 afterwards if you really want to use it. If a test fails
189 the exit code is 1 and a message explains what is not
190 working as needed, otherwise the exit code is 0 and OK is
191 printed.
192
f64cb88d
NTND
193--force-untracked-cache::
194 For safety, `--untracked-cache` performs tests on the working
195 directory to make sure untracked cache can be used. These
196 tests can take a few seconds. `--force-untracked-cache` can be
197 used to skip the tests.
198
e994004f 199\--::
2cf565c5
DG
200 Do not interpret any more arguments as options.
201
202<file>::
203 Files to act on.
5773c9f2 204 Note that files beginning with '.' are discarded. This includes
a6080a0a 205 `./file` and `dir/./file`. If you don't want this, then use
2cf565c5
DG
206 cleaner names.
207 The same applies to directories ending '/' and paths with '//'
208
209Using --refresh
210---------------
5f3aa197 211'--refresh' does not calculate a new sha1 file or bring the index
2cf565c5 212up-to-date for mode/content changes. But what it *does* do is to
5f3aa197
LS
213"re-match" the stat information of a file with the index, so that you
214can refresh the index for a file that hasn't been changed but where
2cf565c5
DG
215the stat entry is out of date.
216
0b444cdb 217For example, you'd want to do this after doing a 'git read-tree', to link
5f3aa197 218up the stat index details with the proper files.
2cf565c5 219
df6e1516
BL
220Using --cacheinfo or --info-only
221--------------------------------
222'--cacheinfo' is used to register a file that is not in the
223current working directory. This is useful for minimum-checkout
224merging.
225
df8baa42 226To pretend you have a file with mode and sha1 at path, say:
2cf565c5 227
61f693bd 228----------------
7ac92f64 229$ git update-index --cacheinfo <mode>,<sha1>,<path>
61f693bd 230----------------
2cf565c5 231
df6e1516
BL
232'--info-only' is used to register files without placing them in the object
233database. This is useful for status-only repositories.
2cf565c5 234
df6e1516
BL
235Both '--cacheinfo' and '--info-only' behave similarly: the index is updated
236but the object database isn't. '--cacheinfo' is useful when the object is
237in the database but the file isn't available locally. '--info-only' is
238useful when the file is available, but you do not wish to update the
239object database.
240
d23748a6
JH
241
242Using --index-info
243------------------
244
245`--index-info` is a more powerful mechanism that lets you feed
246multiple entry definitions from the standard input, and designed
247specifically for scripts. It can take inputs of three formats:
248
249 . mode SP sha1 TAB path
250+
251The first format is what "git-apply --index-info"
252reports, and used to reconstruct a partial tree
253that is used for phony merge base tree when falling
254back on 3-way merge.
255
256 . mode SP type SP sha1 TAB path
257+
0b444cdb 258The second format is to stuff 'git ls-tree' output
d23748a6
JH
259into the index file.
260
261 . mode SP sha1 SP stage TAB path
262+
263This format is to put higher order stages into the
0b444cdb 264index file and matches 'git ls-files --stage' output.
d23748a6
JH
265
266To place a higher stage entry to the index, the path should
267first be removed by feeding a mode=0 entry for the path, and
268then feeding necessary input lines in the third format.
269
270For example, starting with this index:
271
272------------
273$ git ls-files -s
274100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz
275------------
276
277you can feed the following input to `--index-info`:
278
279------------
280$ git update-index --index-info
2810 0000000000000000000000000000000000000000 frotz
282100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
283100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
284------------
285
286The first line of the input feeds 0 as the mode to remove the
d5fa1f1a 287path; the SHA-1 does not matter as long as it is well formatted.
d23748a6
JH
288Then the second and third line feeds stage 1 and stage 2 entries
289for that path. After the above, we would end up with this:
290
291------------
292$ git ls-files -s
293100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
294100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
295------------
296
297
bae777db
JF
298Using ``assume unchanged'' bit
299------------------------------
f9666adf 300
2de9b711 301Many operations in Git depend on your filesystem to have an
f9666adf
JH
302efficient `lstat(2)` implementation, so that `st_mtime`
303information for working tree files can be cheaply checked to see
304if the file contents have changed from the version recorded in
305the index file. Unfortunately, some filesystems have
306inefficient `lstat(2)`. If your filesystem is one of them, you
307can set "assume unchanged" bit to paths you have not changed to
2de9b711
TA
308cause Git not to do this check. Note that setting this bit on a
309path does not mean Git will check the contents of the file to
310see if it has changed -- it makes Git to omit any checking and
f9666adf 311assume it has *not* changed. When you make changes to working
2de9b711 312tree files, you have to explicitly tell Git about it by dropping
f9666adf
JH
313"assume unchanged" bit, either before or after you modify them.
314
315In order to set "assume unchanged" bit, use `--assume-unchanged`
acd6d7e7
SN
316option. To unset, use `--no-assume-unchanged`. To see which files
317have the "assume unchanged" bit set, use `git ls-files -v`
318(see linkgit:git-ls-files[1]).
f9666adf
JH
319
320The command looks at `core.ignorestat` configuration variable. When
b1889c36 321this is true, paths updated with `git update-index paths...` and
2de9b711 322paths updated with other Git commands that update both index and
0b444cdb
TR
323working tree (e.g. 'git apply --index', 'git checkout-index -u',
324and 'git read-tree -u') are automatically marked as "assume
f9666adf 325unchanged". Note that "assume unchanged" bit is *not* set if
b1889c36
JN
326`git update-index --refresh` finds the working tree file matches
327the index (use `git update-index --really-refresh` if you want
f9666adf
JH
328to mark them as "assume unchanged").
329
330
df6e1516
BL
331Examples
332--------
2cf565c5
DG
333To update and refresh only the files already checked out:
334
61f693bd 335----------------
b1889c36 336$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh
61f693bd 337----------------
2cf565c5 338
48aeecdc
SE
339On an inefficient filesystem with `core.ignorestat` set::
340+
f9666adf 341------------
48aeecdc
SE
342$ git update-index --really-refresh <1>
343$ git update-index --no-assume-unchanged foo.c <2>
344$ git diff --name-only <3>
f9666adf 345$ edit foo.c
48aeecdc 346$ git diff --name-only <4>
f9666adf 347M foo.c
48aeecdc
SE
348$ git update-index foo.c <5>
349$ git diff --name-only <6>
f9666adf 350$ edit foo.c
48aeecdc
SE
351$ git diff --name-only <7>
352$ git update-index --no-assume-unchanged foo.c <8>
353$ git diff --name-only <9>
f9666adf 354M foo.c
48aeecdc
SE
355------------
356+
357<1> forces lstat(2) to set "assume unchanged" bits for paths that match index.
f9666adf
JH
358<2> mark the path to be edited.
359<3> this does lstat(2) and finds index matches the path.
48aeecdc 360<4> this does lstat(2) and finds index does *not* match the path.
f9666adf
JH
361<5> registering the new version to index sets "assume unchanged" bit.
362<6> and it is assumed unchanged.
363<7> even after you edit it.
364<8> you can tell about the change after the fact.
365<9> now it checks with lstat(2) and finds it has been changed.
f9666adf 366
2cf565c5 367
44a36913
NTND
368Skip-worktree bit
369-----------------
370
371Skip-worktree bit can be defined in one (long) sentence: When reading
372an entry, if it is marked as skip-worktree, then Git pretends its
373working directory version is up to date and read the index version
374instead.
375
376To elaborate, "reading" means checking for file existence, reading
377file attributes or file content. The working directory version may be
378present or absent. If present, its content may match against the index
379version or not. Writing is not affected by this bit, content safety
380is still first priority. Note that Git _can_ update working directory
381file, that is marked skip-worktree, if it is safe to do so (i.e.
382working directory version matches index version)
383
384Although this bit looks similar to assume-unchanged bit, its goal is
385different from assume-unchanged bit's. Skip-worktree also takes
386precedence over assume-unchanged bit when both are set.
387
388
5773c9f2
JH
389Configuration
390-------------
391
392The command honors `core.filemode` configuration variable. If
466d1f15 393your repository is on a filesystem whose executable bits are
5162e697 394unreliable, this should be set to 'false' (see linkgit:git-config[1]).
61f693bd
JL
395This causes the command to ignore differences in file modes recorded
396in the index and the file mode on the filesystem if they differ only on
5773c9f2 397executable bit. On such an unfortunate filesystem, you may
0b444cdb 398need to use 'git update-index --chmod='.
5773c9f2 399
78a8d641 400Quite similarly, if `core.symlinks` configuration variable is set
5162e697 401to 'false' (see linkgit:git-config[1]), symbolic links are checked out
78a8d641
JS
402as plain files, and this command does not modify a recorded file mode
403from symbolic link to regular file.
404
f9666adf
JH
405The command looks at `core.ignorestat` configuration variable. See
406'Using "assume unchanged" bit' section above.
407
1ce4790b
AR
408The command also looks at `core.trustctime` configuration variable.
409It can be useful when the inode change time is regularly modified by
410something outside Git (file system crawlers and backup systems use
411ctime for marking files processed) (see linkgit:git-config[1]).
412
61f693bd 413
56ae8df5 414SEE ALSO
61f693bd 415--------
5162e697 416linkgit:git-config[1],
acd6d7e7
SN
417linkgit:git-add[1],
418linkgit:git-ls-files[1]
61f693bd 419
2cf565c5
DG
420GIT
421---
9e1f0a85 422Part of the linkgit:git[1] suite