]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git-update-index.txt
Documentation: typofix --column description
[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]
8dfb04ae 19 [--[no-]ignore-skip-worktree-entries]
780494b1 20 [--[no-]fsmonitor-valid]
5fdeacb0 21 [--ignore-submodules]
bc497127 22 [--[no-]split-index]
eaab83d0 23 [--[no-|test-|force-]untracked-cache]
780494b1 24 [--[no-]fsmonitor]
7099c9c7 25 [--really-refresh] [--unresolve] [--again | -g]
14470c0d 26 [--info-only] [--index-info]
69dec66b 27 [-z] [--stdin] [--index-version <n>]
14470c0d 28 [--verbose]
0adda936 29 [--] [<file>...]
2cf565c5
DG
30
31DESCRIPTION
32-----------
b356d236
UG
33Modifies the index. Each file mentioned is updated into the index and
34any 'unmerged' or 'needs updating' state is cleared.
2cf565c5 35
5162e697 36See also linkgit:git-add[1] for a more user-friendly way to do some of
e701ccc3
MM
37the most common operations on the index.
38
0b444cdb 39The way 'git update-index' handles files it is told about can be modified
2cf565c5
DG
40using the various options:
41
42OPTIONS
43-------
44--add::
5f3aa197 45 If a specified file isn't in the index already then it's
2cf565c5
DG
46 added.
47 Default behaviour is to ignore new files.
48
49--remove::
5f3aa197 50 If a specified file is in the index but is missing then it's
2cf565c5 51 removed.
abda1ef5 52 Default behavior is to ignore removed file.
2cf565c5
DG
53
54--refresh::
5f3aa197 55 Looks at the current index and checks to see if merges or
2cf565c5
DG
56 updates are needed by checking stat() information.
57
14470c0d 58-q::
5f3aa197 59 Quiet. If --refresh finds that the index needs an update, the
14470c0d 60 default behavior is to error out. This option makes
0b444cdb 61 'git update-index' continue anyway.
14470c0d 62
04c8ce9c 63--ignore-submodules::
5fdeacb0
JS
64 Do not try to update submodules. This option is only respected
65 when passed before --refresh.
66
14470c0d 67--unmerged::
5f3aa197 68 If --refresh finds unmerged changes in the index, the default
0b444cdb 69 behavior is to error out. This option makes 'git update-index'
14470c0d
CS
70 continue anyway.
71
2cf565c5
DG
72--ignore-missing::
73 Ignores missing files during a --refresh
74
ec160ae1 75--cacheinfo <mode>,<object>,<path>::
2cf565c5 76--cacheinfo <mode> <object> <path>::
ec160ae1
JH
77 Directly insert the specified info into the index. For
78 backward compatibility, you can also give these three
79 arguments as three separate parameters, but new users are
80 encouraged to use a single-parameter form.
a6080a0a 81
14470c0d 82--index-info::
7acab8f1 83 Read index information from stdin.
14470c0d
CS
84
85--chmod=(+|-)x::
a6080a0a 86 Set the execute permissions on the updated files.
14470c0d 87
0460ed2c 88--[no-]assume-unchanged::
ccadb25f
PO
89 When this flag is specified, the object names recorded
90 for the paths are not updated. Instead, this option
91 sets/unsets the "assume unchanged" bit for the
92 paths. When the "assume unchanged" bit is on, the user
93 promises not to change the file and allows Git to assume
94 that the working tree file matches what is recorded in
95 the index. If you want to change the working tree file,
96 you need to unset the bit to tell Git. This is
f9666adf
JH
97 sometimes helpful when working with a big project on a
98 filesystem that has very slow lstat(2) system call
99 (e.g. cifs).
6259ac66 100+
6259ac66
PB
101Git will fail (gracefully) in case it needs to modify this file
102in the index e.g. when merging in a commit;
103thus, in case the assumed-untracked file is changed upstream,
104you will need to handle the situation manually.
f9666adf 105
466d1f15 106--really-refresh::
bcf9626a 107 Like `--refresh`, but checks stat information unconditionally,
466d1f15
ŠN
108 without regard to the "assume unchanged" setting.
109
0460ed2c 110--[no-]skip-worktree::
44a36913
NTND
111 When one of these flags is specified, the object name recorded
112 for the paths are not updated. Instead, these options
113 set and unset the "skip-worktree" bit for the paths. See
114 section "Skip-worktree bit" below for more information.
115
8dfb04ae
JS
116
117--[no-]ignore-skip-worktree-entries::
118 Do not remove skip-worktree (AKA "index-only") entries even when
119 the `--remove` option was specified.
120
780494b1
BP
121--[no-]fsmonitor-valid::
122 When one of these flags is specified, the object name recorded
123 for the paths are not updated. Instead, these options
124 set and unset the "fsmonitor valid" bit for the paths. See
125 section "File System Monitor" below for more information.
126
3240240f
SB
127-g::
128--again::
0b444cdb 129 Runs 'git update-index' itself on the paths whose index
83e77a25
JH
130 entries are different from those from the `HEAD` commit.
131
060729dd
MK
132--unresolve::
133 Restores the 'unmerged' or 'needs updating' state of a
134 file during a merge if it was cleared by accident.
135
df6e1516
BL
136--info-only::
137 Do not create objects in the object database for all
138 <file> arguments that follow this flag; just insert
5f3aa197 139 their object IDs into the index.
df6e1516 140
2cf565c5
DG
141--force-remove::
142 Remove the file from the index even when the working directory
9b63f501 143 still has such a file. (Implies --remove.)
2cf565c5
DG
144
145--replace::
146 By default, when a file `path` exists in the index,
0b444cdb 147 'git update-index' refuses an attempt to add `path/file`.
2cf565c5
DG
148 Similarly if a file `path/file` exists, a file `path`
149 cannot be added. With --replace flag, existing entries
04c8ce9c 150 that conflict with the entry being added are
2cf565c5
DG
151 automatically removed with warning messages.
152
1f7f99de
JH
153--stdin::
154 Instead of taking list of paths from the command line,
155 read list of paths from the standard input. Paths are
156 separated by LF (i.e. one path per line) by default.
157
14470c0d
CS
158--verbose::
159 Report what is being added and removed from index.
160
69dec66b
JH
161--index-version <n>::
162 Write the resulting index out in the named on-disk format version.
647d8794
NTND
163 Supported versions are 2, 3 and 4. The current default version is 2
164 or 3, depending on whether extra features are used, such as
165 `git add -N`.
166+
167Version 4 performs a simple pathname compression that reduces index
168size by 30%-50% on large repositories, which results in faster load
be94568b 169time. Version 4 is relatively young (first released in 1.8.0 in
647d8794
NTND
170October 2012). Other Git implementations such as JGit and libgit2
171may not support it yet.
69dec66b 172
1f7f99de 173-z::
537497be
BW
174 Only meaningful with `--stdin` or `--index-info`; paths are
175 separated with NUL character instead of LF.
1f7f99de 176
c18b80a0
NTND
177--split-index::
178--no-split-index::
b4601395
CC
179 Enable or disable split index mode. If split-index mode is
180 already enabled and `--split-index` is given again, all
181 changes in $GIT_DIR/index are pushed back to the shared index
182 file.
13c0e4c4
CC
183+
184These options take effect whatever the value of the `core.splitIndex`
185configuration variable (see linkgit:git-config[1]). But a warning is
186emitted when the change goes against the configured value, as the
187configured value will take effect next time the index is read and this
188will remove the intended effect of the option.
c18b80a0 189
9e597241
NTND
190--untracked-cache::
191--no-untracked-cache::
435ec090
CC
192 Enable or disable untracked cache feature. Please use
193 `--test-untracked-cache` before enabling it.
194+
195These options take effect whatever the value of the `core.untrackedCache`
196configuration variable (see linkgit:git-config[1]). But a warning is
197emitted when the change goes against the configured value, as the
198configured value will take effect next time the index is read and this
199will remove the intended effect of the option.
9e597241 200
eaab83d0
CC
201--test-untracked-cache::
202 Only perform tests on the working directory to make sure
203 untracked cache can be used. You have to manually enable
435ec090
CC
204 untracked cache using `--untracked-cache` or
205 `--force-untracked-cache` or the `core.untrackedCache`
206 configuration variable afterwards if you really want to use
207 it. If a test fails the exit code is 1 and a message
208 explains what is not working as needed, otherwise the exit
209 code is 0 and OK is printed.
eaab83d0 210
f64cb88d 211--force-untracked-cache::
435ec090
CC
212 Same as `--untracked-cache`. Provided for backwards
213 compatibility with older versions of Git where
214 `--untracked-cache` used to imply `--test-untracked-cache` but
215 this option would enable the extension unconditionally.
f64cb88d 216
780494b1
BP
217--fsmonitor::
218--no-fsmonitor::
219 Enable or disable files system monitor feature. These options
220 take effect whatever the value of the `core.fsmonitor`
221 configuration variable (see linkgit:git-config[1]). But a warning
222 is emitted when the change goes against the configured value, as
223 the configured value will take effect next time the index is
224 read and this will remove the intended effect of the option.
225
e994004f 226\--::
2cf565c5
DG
227 Do not interpret any more arguments as options.
228
229<file>::
230 Files to act on.
5773c9f2 231 Note that files beginning with '.' are discarded. This includes
a6080a0a 232 `./file` and `dir/./file`. If you don't want this, then use
2cf565c5
DG
233 cleaner names.
234 The same applies to directories ending '/' and paths with '//'
235
76a8788c 236USING --REFRESH
2cf565c5 237---------------
bcf9626a 238`--refresh` does not calculate a new sha1 file or bring the index
7560f547 239up to date for mode/content changes. But what it *does* do is to
5f3aa197
LS
240"re-match" the stat information of a file with the index, so that you
241can refresh the index for a file that hasn't been changed but where
2cf565c5
DG
242the stat entry is out of date.
243
0b444cdb 244For example, you'd want to do this after doing a 'git read-tree', to link
5f3aa197 245up the stat index details with the proper files.
2cf565c5 246
76a8788c 247USING --CACHEINFO OR --INFO-ONLY
df6e1516 248--------------------------------
bcf9626a 249`--cacheinfo` is used to register a file that is not in the
df6e1516
BL
250current working directory. This is useful for minimum-checkout
251merging.
252
388d0ff6 253To pretend you have a file at path with mode and sha1, say:
2cf565c5 254
61f693bd 255----------------
388d0ff6 256$ git update-index --add --cacheinfo <mode>,<sha1>,<path>
61f693bd 257----------------
2cf565c5 258
bcf9626a 259`--info-only` is used to register files without placing them in the object
df6e1516 260database. This is useful for status-only repositories.
2cf565c5 261
bcf9626a
MM
262Both `--cacheinfo` and `--info-only` behave similarly: the index is updated
263but the object database isn't. `--cacheinfo` is useful when the object is
264in the database but the file isn't available locally. `--info-only` is
df6e1516
BL
265useful when the file is available, but you do not wish to update the
266object database.
267
d23748a6 268
76a8788c 269USING --INDEX-INFO
d23748a6
JH
270------------------
271
272`--index-info` is a more powerful mechanism that lets you feed
273multiple entry definitions from the standard input, and designed
274specifically for scripts. It can take inputs of three formats:
275
d23748a6
JH
276 . mode SP type SP sha1 TAB path
277+
e05aa688 278This format is to stuff `git ls-tree` output into the index.
d23748a6
JH
279
280 . mode SP sha1 SP stage TAB path
281+
282This format is to put higher order stages into the
0b444cdb 283index file and matches 'git ls-files --stage' output.
d23748a6 284
e05aa688
JH
285 . mode SP sha1 TAB path
286+
287This format is no longer produced by any Git command, but is
288and will continue to be supported by `update-index --index-info`.
289
d23748a6
JH
290To place a higher stage entry to the index, the path should
291first be removed by feeding a mode=0 entry for the path, and
292then feeding necessary input lines in the third format.
293
294For example, starting with this index:
295
296------------
297$ git ls-files -s
298100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz
299------------
300
301you can feed the following input to `--index-info`:
302
303------------
304$ git update-index --index-info
3050 0000000000000000000000000000000000000000 frotz
306100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
307100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
308------------
309
310The first line of the input feeds 0 as the mode to remove the
d5fa1f1a 311path; the SHA-1 does not matter as long as it is well formatted.
d23748a6
JH
312Then the second and third line feeds stage 1 and stage 2 entries
313for that path. After the above, we would end up with this:
314
315------------
316$ git ls-files -s
317100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
318100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
319------------
320
321
76a8788c 322USING ``ASSUME UNCHANGED'' BIT
bae777db 323------------------------------
f9666adf 324
2de9b711 325Many operations in Git depend on your filesystem to have an
f9666adf
JH
326efficient `lstat(2)` implementation, so that `st_mtime`
327information for working tree files can be cheaply checked to see
328if the file contents have changed from the version recorded in
329the index file. Unfortunately, some filesystems have
330inefficient `lstat(2)`. If your filesystem is one of them, you
331can set "assume unchanged" bit to paths you have not changed to
2de9b711
TA
332cause Git not to do this check. Note that setting this bit on a
333path does not mean Git will check the contents of the file to
334see if it has changed -- it makes Git to omit any checking and
f9666adf 335assume it has *not* changed. When you make changes to working
2de9b711 336tree files, you have to explicitly tell Git about it by dropping
f9666adf
JH
337"assume unchanged" bit, either before or after you modify them.
338
339In order to set "assume unchanged" bit, use `--assume-unchanged`
acd6d7e7
SN
340option. To unset, use `--no-assume-unchanged`. To see which files
341have the "assume unchanged" bit set, use `git ls-files -v`
342(see linkgit:git-ls-files[1]).
f9666adf
JH
343
344The command looks at `core.ignorestat` configuration variable. When
b1889c36 345this is true, paths updated with `git update-index paths...` and
2de9b711 346paths updated with other Git commands that update both index and
0b444cdb
TR
347working tree (e.g. 'git apply --index', 'git checkout-index -u',
348and 'git read-tree -u') are automatically marked as "assume
f9666adf 349unchanged". Note that "assume unchanged" bit is *not* set if
b1889c36
JN
350`git update-index --refresh` finds the working tree file matches
351the index (use `git update-index --really-refresh` if you want
f9666adf
JH
352to mark them as "assume unchanged").
353
354
76a8788c 355EXAMPLES
df6e1516 356--------
2cf565c5
DG
357To update and refresh only the files already checked out:
358
61f693bd 359----------------
b1889c36 360$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh
61f693bd 361----------------
2cf565c5 362
48aeecdc
SE
363On an inefficient filesystem with `core.ignorestat` set::
364+
f9666adf 365------------
48aeecdc
SE
366$ git update-index --really-refresh <1>
367$ git update-index --no-assume-unchanged foo.c <2>
368$ git diff --name-only <3>
f9666adf 369$ edit foo.c
48aeecdc 370$ git diff --name-only <4>
f9666adf 371M foo.c
48aeecdc
SE
372$ git update-index foo.c <5>
373$ git diff --name-only <6>
f9666adf 374$ edit foo.c
48aeecdc
SE
375$ git diff --name-only <7>
376$ git update-index --no-assume-unchanged foo.c <8>
377$ git diff --name-only <9>
f9666adf 378M foo.c
48aeecdc
SE
379------------
380+
381<1> forces lstat(2) to set "assume unchanged" bits for paths that match index.
f9666adf
JH
382<2> mark the path to be edited.
383<3> this does lstat(2) and finds index matches the path.
48aeecdc 384<4> this does lstat(2) and finds index does *not* match the path.
f9666adf
JH
385<5> registering the new version to index sets "assume unchanged" bit.
386<6> and it is assumed unchanged.
387<7> even after you edit it.
388<8> you can tell about the change after the fact.
389<9> now it checks with lstat(2) and finds it has been changed.
f9666adf 390
2cf565c5 391
76a8788c 392SKIP-WORKTREE BIT
44a36913
NTND
393-----------------
394
395Skip-worktree bit can be defined in one (long) sentence: When reading
396an entry, if it is marked as skip-worktree, then Git pretends its
397working directory version is up to date and read the index version
398instead.
399
400To elaborate, "reading" means checking for file existence, reading
401file attributes or file content. The working directory version may be
402present or absent. If present, its content may match against the index
403version or not. Writing is not affected by this bit, content safety
404is still first priority. Note that Git _can_ update working directory
405file, that is marked skip-worktree, if it is safe to do so (i.e.
406working directory version matches index version)
407
408Although this bit looks similar to assume-unchanged bit, its goal is
409different from assume-unchanged bit's. Skip-worktree also takes
410precedence over assume-unchanged bit when both are set.
411
76a8788c 412SPLIT INDEX
b4601395
CC
413-----------
414
415This mode is designed for repositories with very large indexes, and
416aims at reducing the time it takes to repeatedly write these indexes.
417
418In this mode, the index is split into two files, $GIT_DIR/index and
419$GIT_DIR/sharedindex.<SHA-1>. Changes are accumulated in
420$GIT_DIR/index, the split index, while the shared index file contains
421all index entries and stays unchanged.
422
423All changes in the split index are pushed back to the shared index
424file when the number of entries in the split index reaches a level
425specified by the splitIndex.maxPercentChange config variable (see
426linkgit:git-config[1]).
427
428Each time a new shared index file is created, the old shared index
429files are deleted if their modification time is older than what is
430specified by the splitIndex.sharedIndexExpire config variable (see
431linkgit:git-config[1]).
432
433To avoid deleting a shared index file that is still used, its
031fd4b9 434modification time is updated to the current time every time a new split
b4601395
CC
435index based on the shared index file is either created or read from.
436
76a8788c 437UNTRACKED CACHE
435ec090
CC
438---------------
439
440This cache is meant to speed up commands that involve determining
441untracked files such as `git status`.
442
443This feature works by recording the mtime of the working tree
444directories and then omitting reading directories and stat calls
445against files in those directories whose mtime hasn't changed. For
446this to work the underlying operating system and file system must
447change the `st_mtime` field of directories if files in the directory
448are added, modified or deleted.
449
450You can test whether the filesystem supports that with the
451`--test-untracked-cache` option. The `--untracked-cache` option used
452to implicitly perform that test in older versions of Git, but that's
453no longer the case.
454
455If you want to enable (or disable) this feature, it is easier to use
456the `core.untrackedCache` configuration variable (see
457linkgit:git-config[1]) than using the `--untracked-cache` option to
458`git update-index` in each repository, especially if you want to do so
459across all repositories you use, because you can set the configuration
460variable to `true` (or `false`) in your `$HOME/.gitconfig` just once
461and have it affect all repositories you touch.
462
463When the `core.untrackedCache` configuration variable is changed, the
464untracked cache is added to or removed from the index the next time a
465command reads the index; while when `--[no-|force-]untracked-cache`
466are used, the untracked cache is immediately added to or removed from
467the index.
44a36913 468
9b978691
ÆAB
469Before 2.17, the untracked cache had a bug where replacing a directory
470with a symlink to another directory could cause it to incorrectly show
471files tracked by git as untracked. See the "status: add a failing test
472showing a core.untrackedCache bug" commit to git.git. A workaround for
473that is (and this might work for other undiscovered bugs in the
474future):
475
476----------------
477$ git -c core.untrackedCache=false status
478----------------
479
480This bug has also been shown to affect non-symlink cases of replacing
481a directory with a file when it comes to the internal structures of
482the untracked cache, but no case has been reported where this resulted in
483wrong "git status" output.
484
7bf0be75
ÆAB
485There are also cases where existing indexes written by git versions
486before 2.17 will reference directories that don't exist anymore,
487potentially causing many "could not open directory" warnings to be
488printed on "git status". These are new warnings for existing issues
489that were previously silently discarded.
490
491As with the bug described above the solution is to one-off do a "git
492status" run with `core.untrackedCache=false` to flush out the leftover
493bad data.
494
76a8788c 495FILE SYSTEM MONITOR
780494b1
BP
496-------------------
497
498This feature is intended to speed up git operations for repos that have
499large working directories.
500
501It enables git to work together with a file system monitor (see the
502"fsmonitor-watchman" section of linkgit:githooks[5]) that can
503inform it as to what files have been modified. This enables git to avoid
504having to lstat() every file to find modified files.
505
506When used in conjunction with the untracked cache, it can further improve
507performance by avoiding the cost of scanning the entire working directory
508looking for new files.
509
510If you want to enable (or disable) this feature, it is easier to use
511the `core.fsmonitor` configuration variable (see
512linkgit:git-config[1]) than using the `--fsmonitor` option to
513`git update-index` in each repository, especially if you want to do so
514across all repositories you use, because you can set the configuration
4ccf461f
BP
515variable in your `$HOME/.gitconfig` just once and have it affect all
516repositories you touch.
780494b1
BP
517
518When the `core.fsmonitor` configuration variable is changed, the
519file system monitor is added to or removed from the index the next time
520a command reads the index. When `--[no-]fsmonitor` are used, the file
521system monitor is immediately added to or removed from the index.
522
76a8788c 523CONFIGURATION
5773c9f2
JH
524-------------
525
526The command honors `core.filemode` configuration variable. If
466d1f15 527your repository is on a filesystem whose executable bits are
5162e697 528unreliable, this should be set to 'false' (see linkgit:git-config[1]).
61f693bd
JL
529This causes the command to ignore differences in file modes recorded
530in the index and the file mode on the filesystem if they differ only on
5773c9f2 531executable bit. On such an unfortunate filesystem, you may
0b444cdb 532need to use 'git update-index --chmod='.
5773c9f2 533
78a8d641 534Quite similarly, if `core.symlinks` configuration variable is set
5162e697 535to 'false' (see linkgit:git-config[1]), symbolic links are checked out
78a8d641
JS
536as plain files, and this command does not modify a recorded file mode
537from symbolic link to regular file.
538
f9666adf
JH
539The command looks at `core.ignorestat` configuration variable. See
540'Using "assume unchanged" bit' section above.
541
1ce4790b
AR
542The command also looks at `core.trustctime` configuration variable.
543It can be useful when the inode change time is regularly modified by
544something outside Git (file system crawlers and backup systems use
545ctime for marking files processed) (see linkgit:git-config[1]).
546
435ec090
CC
547The untracked cache extension can be enabled by the
548`core.untrackedCache` configuration variable (see
549linkgit:git-config[1]).
61f693bd 550
1b13e903 551NOTES
552-----
553
554Users often try to use the assume-unchanged and skip-worktree bits
555to tell Git to ignore changes to files that are tracked. This does not
556work as expected, since Git may still check working tree files against
557the index when performing certain operations. In general, Git does not
558provide a way to ignore changes to tracked files, so alternate solutions
559are recommended.
560
561For example, if the file you want to change is some sort of config file,
562the repository can include a sample config file that can then be copied
563into the ignored name and modified. The repository can even include a
564script to treat the sample file as a template, modifying and copying it
565automatically.
566
56ae8df5 567SEE ALSO
61f693bd 568--------
5162e697 569linkgit:git-config[1],
acd6d7e7
SN
570linkgit:git-add[1],
571linkgit:git-ls-files[1]
61f693bd 572
2cf565c5
DG
573GIT
574---
9e1f0a85 575Part of the linkgit:git[1] suite