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