blob: c92775829bd26d3d993600fd5bb104e527de59f4 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231git-update-index(1)
2===================
3
4NAME
5----
Junio C Hamano7c73c662007-01-19 00:37:506git-update-index - Register file contents in the working tree to the index
Junio C Hamano1a4e8412005-12-27 08:17:237
8
9SYNOPSIS
10--------
Junio C Hamano7e9f6b72006-02-22 10:44:5511[verse]
Junio C Hamanofce7c7e2008-07-02 03:06:3812'git update-index'
Junio C Hamano46338f52006-05-04 00:46:4413 [--add] [--remove | --force-remove] [--replace]
14 [--refresh] [-q] [--unmerged] [--ignore-missing]
Junio C Hamanod2179ef2010-10-22 04:12:1715 [(--cacheinfo <mode> <object> <file>)...]
Junio C Hamano1a4e8412005-12-27 08:17:2316 [--chmod=(+|-)x]
Junio C Hamano7e9f6b72006-02-22 10:44:5517 [--assume-unchanged | --no-assume-unchanged]
Junio C Hamano3c8d6702010-01-13 23:09:0318 [--skip-worktree | --no-skip-worktree]
Junio C Hamanodfccbb02008-05-26 01:16:1419 [--ignore-submodules]
Junio C Hamano8a0a21e2006-08-24 07:37:4520 [--really-refresh] [--unresolve] [--again | -g]
Junio C Hamano1a4e8412005-12-27 08:17:2321 [--info-only] [--index-info]
Junio C Hamanob76a6862012-05-02 22:02:4622 [-z] [--stdin] [--index-version <n>]
Junio C Hamano1a4e8412005-12-27 08:17:2323 [--verbose]
Junio C Hamanod2179ef2010-10-22 04:12:1724 [--] [<file>...]
Junio C Hamano1a4e8412005-12-27 08:17:2325
26DESCRIPTION
27-----------
28Modifies the index or directory cache. Each file mentioned is updated
29into the index and any 'unmerged' or 'needs updating' state is
30cleared.
31
Junio C Hamano35738e82008-01-07 07:55:4632See also linkgit:git-add[1] for a more user-friendly way to do some of
Junio C Hamano3d30fd52007-05-08 00:32:5333the most common operations on the index.
34
Junio C Hamano1aa40d22010-01-21 17:46:4335The way 'git update-index' handles files it is told about can be modified
Junio C Hamano1a4e8412005-12-27 08:17:2336using the various options:
37
38OPTIONS
39-------
40--add::
41If a specified file isn't in the index already then it's
42added.
43Default behaviour is to ignore new files.
44
45--remove::
46If a specified file is in the index but is missing then it's
47removed.
Junio C Hamano341071d2006-06-04 07:24:4848Default behavior is to ignore removed file.
Junio C Hamano1a4e8412005-12-27 08:17:2349
50--refresh::
51Looks at the current index and checks to see if merges or
52updates are needed by checking stat() information.
53
54-q::
55 Quiet. If --refresh finds that the index needs an update, the
56 default behavior is to error out. This option makes
Junio C Hamano1aa40d22010-01-21 17:46:4357'git update-index' continue anyway.
Junio C Hamano1a4e8412005-12-27 08:17:2358
Junio C Hamano54bf1e22008-12-20 06:30:1159--ignore-submodules::
Junio C Hamanodfccbb02008-05-26 01:16:1460Do not try to update submodules. This option is only respected
61when passed before --refresh.
62
Junio C Hamano1a4e8412005-12-27 08:17:2363--unmerged::
64 If --refresh finds unmerged changes in the index, the default
Junio C Hamano1aa40d22010-01-21 17:46:4365behavior is to error out. This option makes 'git update-index'
Junio C Hamano1a4e8412005-12-27 08:17:2366 continue anyway.
67
68--ignore-missing::
69Ignores missing files during a --refresh
70
71--cacheinfo <mode> <object> <path>::
72Directly insert the specified info into the index.
Junio C Hamanoa77a5132007-06-08 16:13:4473
Junio C Hamano1a4e8412005-12-27 08:17:2374--index-info::
75 Read index information from stdin.
76
77--chmod=(+|-)x::
Junio C Hamanoa77a5132007-06-08 16:13:4478 Set the execute permissions on the updated files.
Junio C Hamano1a4e8412005-12-27 08:17:2379
Junio C Hamanoeb415992008-06-08 22:49:4780--assume-unchanged::
81--no-assume-unchanged::
Junio C Hamano54bf1e22008-12-20 06:30:1182When these flags are specified, the object names recorded
Junio C Hamano7e9f6b72006-02-22 10:44:5583for the paths are not updated. Instead, these options
Junio C Hamano54bf1e22008-12-20 06:30:1184set and unset the "assume unchanged" bit for the
Junio C Hamano076ffcc2013-02-06 05:13:2185paths. When the "assume unchanged" bit is on, Git stops
Junio C Hamano7e9f6b72006-02-22 10:44:5586checking the working tree files for possible
87modifications, so you need to manually unset the bit to
Junio C Hamano076ffcc2013-02-06 05:13:2188tell Git when you change the working tree file. This is
Junio C Hamano7e9f6b72006-02-22 10:44:5589sometimes helpful when working with a big project on a
90filesystem that has very slow lstat(2) system call
91(e.g. cifs).
Junio C Hamano915cd9b2008-07-20 01:24:1792+
93This option can be also used as a coarse file-level mechanism
94to ignore uncommitted changes in tracked files (akin to what
95`.gitignore` does for untracked files).
Junio C Hamano915cd9b2008-07-20 01:24:1796Git will fail (gracefully) in case it needs to modify this file
97in the index e.g. when merging in a commit;
98thus, in case the assumed-untracked file is changed upstream,
99you will need to handle the situation manually.
Junio C Hamano7e9f6b72006-02-22 10:44:55100
Junio C Hamano446ed772009-11-10 22:02:20101--really-refresh::
102Like '--refresh', but checks stat information unconditionally,
103without regard to the "assume unchanged" setting.
104
Junio C Hamano3c8d6702010-01-13 23:09:03105--skip-worktree::
106--no-skip-worktree::
107When one of these flags is specified, the object name recorded
108for the paths are not updated. Instead, these options
109set and unset the "skip-worktree" bit for the paths. See
110section "Skip-worktree bit" below for more information.
111
Junio C Hamanoeb415992008-06-08 22:49:47112-g::
113--again::
Junio C Hamano1aa40d22010-01-21 17:46:43114Runs 'git update-index' itself on the paths whose index
Junio C Hamano26a57372006-05-10 00:13:40115entries are different from those from the `HEAD` commit.
116
Junio C Hamano46338f52006-05-04 00:46:44117--unresolve::
118Restores the 'unmerged' or 'needs updating' state of a
119file during a merge if it was cleared by accident.
120
Junio C Hamano1a4e8412005-12-27 08:17:23121--info-only::
122Do not create objects in the object database for all
123<file> arguments that follow this flag; just insert
124their object IDs into the index.
125
126--force-remove::
127Remove the file from the index even when the working directory
128still has such a file. (Implies --remove.)
129
130--replace::
131By default, when a file `path` exists in the index,
Junio C Hamano1aa40d22010-01-21 17:46:43132'git update-index' refuses an attempt to add `path/file`.
Junio C Hamano1a4e8412005-12-27 08:17:23133Similarly if a file `path/file` exists, a file `path`
134cannot be added. With --replace flag, existing entries
Junio C Hamano54bf1e22008-12-20 06:30:11135that conflict with the entry being added are
Junio C Hamano1a4e8412005-12-27 08:17:23136automatically removed with warning messages.
137
138--stdin::
139Instead of taking list of paths from the command line,
140read list of paths from the standard input. Paths are
141separated by LF (i.e. one path per line) by default.
142
143--verbose::
144 Report what is being added and removed from index.
145
Junio C Hamanob76a6862012-05-02 22:02:46146--index-version <n>::
147Write the resulting index out in the named on-disk format version.
Junio C Hamano947ab822013-03-19 23:07:29148Supported versions are 2, 3 and 4. The current default version is 2
149or 3, depending on whether extra features are used, such as
150`git add -N`.
151+
152Version 4 performs a simple pathname compression that reduces index
153size by 30%-50% on large repositories, which results in faster load
154time. Version 4 is relatively young (first released in in 1.8.0 in
155October 2012). Other Git implementations such as JGit and libgit2
156may not support it yet.
Junio C Hamanob76a6862012-05-02 22:02:46157
Junio C Hamano1a4e8412005-12-27 08:17:23158-z::
Junio C Hamanoc27b7332010-10-14 04:37:28159Only meaningful with `--stdin` or `--index-info`; paths are
160separated with NUL character instead of LF.
Junio C Hamano1a4e8412005-12-27 08:17:23161
Junio C Hamano1bb569e2006-05-05 23:14:25162\--::
Junio C Hamano1a4e8412005-12-27 08:17:23163Do not interpret any more arguments as options.
164
165<file>::
166Files to act on.
167Note that files beginning with '.' are discarded. This includes
Junio C Hamanoa77a5132007-06-08 16:13:44168`./file` and `dir/./file`. If you don't want this, then use
Junio C Hamano1a4e8412005-12-27 08:17:23169cleaner names.
170The same applies to directories ending '/' and paths with '//'
171
172Using --refresh
173---------------
174'--refresh' does not calculate a new sha1 file or bring the index
175up-to-date for mode/content changes. But what it *does* do is to
176"re-match" the stat information of a file with the index, so that you
177can refresh the index for a file that hasn't been changed but where
178the stat entry is out of date.
179
Junio C Hamano1aa40d22010-01-21 17:46:43180For example, you'd want to do this after doing a 'git read-tree', to link
Junio C Hamano1a4e8412005-12-27 08:17:23181up the stat index details with the proper files.
182
183Using --cacheinfo or --info-only
184--------------------------------
185'--cacheinfo' is used to register a file that is not in the
186current working directory. This is useful for minimum-checkout
187merging.
188
189To pretend you have a file with mode and sha1 at path, say:
190
191----------------
Junio C Hamanofce7c7e2008-07-02 03:06:38192$ git update-index --cacheinfo mode sha1 path
Junio C Hamano1a4e8412005-12-27 08:17:23193----------------
194
195'--info-only' is used to register files without placing them in the object
196database. This is useful for status-only repositories.
197
198Both '--cacheinfo' and '--info-only' behave similarly: the index is updated
199but the object database isn't. '--cacheinfo' is useful when the object is
200in the database but the file isn't available locally. '--info-only' is
201useful when the file is available, but you do not wish to update the
202object database.
203
204
205Using --index-info
206------------------
207
208`--index-info` is a more powerful mechanism that lets you feed
209multiple entry definitions from the standard input, and designed
210specifically for scripts. It can take inputs of three formats:
211
212 . mode SP sha1 TAB path
213+
214The first format is what "git-apply --index-info"
215reports, and used to reconstruct a partial tree
216that is used for phony merge base tree when falling
217back on 3-way merge.
218
219 . mode SP type SP sha1 TAB path
220+
Junio C Hamano1aa40d22010-01-21 17:46:43221The second format is to stuff 'git ls-tree' output
Junio C Hamano1a4e8412005-12-27 08:17:23222into the index file.
223
224 . mode SP sha1 SP stage TAB path
225+
226This format is to put higher order stages into the
Junio C Hamano1aa40d22010-01-21 17:46:43227index file and matches 'git ls-files --stage' output.
Junio C Hamano1a4e8412005-12-27 08:17:23228
229To place a higher stage entry to the index, the path should
230first be removed by feeding a mode=0 entry for the path, and
231then feeding necessary input lines in the third format.
232
233For example, starting with this index:
234
235------------
236$ git ls-files -s
237100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz
238------------
239
240you can feed the following input to `--index-info`:
241
242------------
243$ git update-index --index-info
2440 0000000000000000000000000000000000000000 frotz
245100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
246100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
247------------
248
249The first line of the input feeds 0 as the mode to remove the
250path; the SHA1 does not matter as long as it is well formatted.
251Then the second and third line feeds stage 1 and stage 2 entries
252for that path. After the above, we would end up with this:
253
254------------
255$ git ls-files -s
256100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
257100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
258------------
259
260
Junio C Hamanofb2ead32006-11-13 23:40:59261Using ``assume unchanged'' bit
262------------------------------
Junio C Hamano7e9f6b72006-02-22 10:44:55263
Junio C Hamano076ffcc2013-02-06 05:13:21264Many operations in Git depend on your filesystem to have an
Junio C Hamano7e9f6b72006-02-22 10:44:55265efficient `lstat(2)` implementation, so that `st_mtime`
266information for working tree files can be cheaply checked to see
267if the file contents have changed from the version recorded in
268the index file. Unfortunately, some filesystems have
269inefficient `lstat(2)`. If your filesystem is one of them, you
270can set "assume unchanged" bit to paths you have not changed to
Junio C Hamano076ffcc2013-02-06 05:13:21271cause Git not to do this check. Note that setting this bit on a
272path does not mean Git will check the contents of the file to
273see if it has changed -- it makes Git to omit any checking and
Junio C Hamano7e9f6b72006-02-22 10:44:55274assume it has *not* changed. When you make changes to working
Junio C Hamano076ffcc2013-02-06 05:13:21275tree files, you have to explicitly tell Git about it by dropping
Junio C Hamano7e9f6b72006-02-22 10:44:55276"assume unchanged" bit, either before or after you modify them.
277
278In order to set "assume unchanged" bit, use `--assume-unchanged`
Junio C Hamano8fb66e52011-10-05 20:59:51279option. To unset, use `--no-assume-unchanged`. To see which files
280have the "assume unchanged" bit set, use `git ls-files -v`
281(see linkgit:git-ls-files[1]).
Junio C Hamano7e9f6b72006-02-22 10:44:55282
283The command looks at `core.ignorestat` configuration variable. When
Junio C Hamanofce7c7e2008-07-02 03:06:38284this is true, paths updated with `git update-index paths...` and
Junio C Hamano076ffcc2013-02-06 05:13:21285paths updated with other Git commands that update both index and
Junio C Hamano1aa40d22010-01-21 17:46:43286working tree (e.g. 'git apply --index', 'git checkout-index -u',
287and 'git read-tree -u') are automatically marked as "assume
Junio C Hamano7e9f6b72006-02-22 10:44:55288unchanged". Note that "assume unchanged" bit is *not* set if
Junio C Hamanofce7c7e2008-07-02 03:06:38289`git update-index --refresh` finds the working tree file matches
290the index (use `git update-index --really-refresh` if you want
Junio C Hamano7e9f6b72006-02-22 10:44:55291to mark them as "assume unchanged").
292
293
Junio C Hamano1a4e8412005-12-27 08:17:23294Examples
295--------
296To update and refresh only the files already checked out:
297
298----------------
Junio C Hamanofce7c7e2008-07-02 03:06:38299$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh
Junio C Hamano1a4e8412005-12-27 08:17:23300----------------
301
Junio C Hamanoc8d88c22006-04-29 07:02:01302On an inefficient filesystem with `core.ignorestat` set::
303+
Junio C Hamano7e9f6b72006-02-22 10:44:55304------------
Junio C Hamanoc8d88c22006-04-29 07:02:01305$ git update-index --really-refresh <1>
306$ git update-index --no-assume-unchanged foo.c <2>
307$ git diff --name-only <3>
Junio C Hamano7e9f6b72006-02-22 10:44:55308$ edit foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01309$ git diff --name-only <4>
Junio C Hamano7e9f6b72006-02-22 10:44:55310M foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01311$ git update-index foo.c <5>
312$ git diff --name-only <6>
Junio C Hamano7e9f6b72006-02-22 10:44:55313$ edit foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01314$ git diff --name-only <7>
315$ git update-index --no-assume-unchanged foo.c <8>
316$ git diff --name-only <9>
Junio C Hamano7e9f6b72006-02-22 10:44:55317M foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01318------------
319+
320<1> forces lstat(2) to set "assume unchanged" bits for paths that match index.
Junio C Hamano7e9f6b72006-02-22 10:44:55321<2> mark the path to be edited.
322<3> this does lstat(2) and finds index matches the path.
Junio C Hamanoc8d88c22006-04-29 07:02:01323<4> this does lstat(2) and finds index does *not* match the path.
Junio C Hamano7e9f6b72006-02-22 10:44:55324<5> registering the new version to index sets "assume unchanged" bit.
325<6> and it is assumed unchanged.
326<7> even after you edit it.
327<8> you can tell about the change after the fact.
328<9> now it checks with lstat(2) and finds it has been changed.
Junio C Hamano7e9f6b72006-02-22 10:44:55329
Junio C Hamano1a4e8412005-12-27 08:17:23330
Junio C Hamano3c8d6702010-01-13 23:09:03331Skip-worktree bit
332-----------------
333
334Skip-worktree bit can be defined in one (long) sentence: When reading
335an entry, if it is marked as skip-worktree, then Git pretends its
336working directory version is up to date and read the index version
337instead.
338
339To elaborate, "reading" means checking for file existence, reading
340file attributes or file content. The working directory version may be
341present or absent. If present, its content may match against the index
342version or not. Writing is not affected by this bit, content safety
343is still first priority. Note that Git _can_ update working directory
344file, that is marked skip-worktree, if it is safe to do so (i.e.
345working directory version matches index version)
346
347Although this bit looks similar to assume-unchanged bit, its goal is
348different from assume-unchanged bit's. Skip-worktree also takes
349precedence over assume-unchanged bit when both are set.
350
351
Junio C Hamano1a4e8412005-12-27 08:17:23352Configuration
353-------------
354
355The command honors `core.filemode` configuration variable. If
Junio C Hamano446ed772009-11-10 22:02:20356your repository is on a filesystem whose executable bits are
Junio C Hamano35738e82008-01-07 07:55:46357unreliable, this should be set to 'false' (see linkgit:git-config[1]).
Junio C Hamano1a4e8412005-12-27 08:17:23358This causes the command to ignore differences in file modes recorded
359in the index and the file mode on the filesystem if they differ only on
360executable bit. On such an unfortunate filesystem, you may
Junio C Hamano1aa40d22010-01-21 17:46:43361need to use 'git update-index --chmod='.
Junio C Hamano1a4e8412005-12-27 08:17:23362
Junio C Hamanoaa83a7d2007-03-05 02:37:29363Quite similarly, if `core.symlinks` configuration variable is set
Junio C Hamano35738e82008-01-07 07:55:46364to 'false' (see linkgit:git-config[1]), symbolic links are checked out
Junio C Hamanoaa83a7d2007-03-05 02:37:29365as plain files, and this command does not modify a recorded file mode
366from symbolic link to regular file.
367
Junio C Hamano7e9f6b72006-02-22 10:44:55368The command looks at `core.ignorestat` configuration variable. See
369'Using "assume unchanged" bit' section above.
370
Junio C Hamano90ccff32008-07-29 08:17:24371The command also looks at `core.trustctime` configuration variable.
372It can be useful when the inode change time is regularly modified by
373something outside Git (file system crawlers and backup systems use
374ctime for marking files processed) (see linkgit:git-config[1]).
375
Junio C Hamano1a4e8412005-12-27 08:17:23376
Junio C Hamano9049d912008-05-29 02:09:50377SEE ALSO
Junio C Hamano1a4e8412005-12-27 08:17:23378--------
Junio C Hamano35738e82008-01-07 07:55:46379linkgit:git-config[1],
Junio C Hamano8fb66e52011-10-05 20:59:51380linkgit:git-add[1],
381linkgit:git-ls-files[1]
Junio C Hamano1a4e8412005-12-27 08:17:23382
Junio C Hamano1a4e8412005-12-27 08:17:23383GIT
384---
Junio C Hamanof7c042d2008-06-06 22:50:53385Part of the linkgit:git[1] suite