blob: e0a87029cdfe9fadd9edd4cc493bedd6b5044ac3 [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 Hamano3d1b5a12013-05-17 23:34:0217 [--[no-]assume-unchanged]
18 [--[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 Hamano3d1b5a12013-05-17 23:34:0280--[no-]assume-unchanged::
Junio C Hamano54bf1e22008-12-20 06:30:1181When these flags are specified, the object names recorded
Junio C Hamano7e9f6b72006-02-22 10:44:5582for the paths are not updated. Instead, these options
Junio C Hamano54bf1e22008-12-20 06:30:1183set and unset the "assume unchanged" bit for the
Junio C Hamano076ffcc2013-02-06 05:13:2184paths. When the "assume unchanged" bit is on, Git stops
Junio C Hamano7e9f6b72006-02-22 10:44:5585checking the working tree files for possible
86modifications, so you need to manually unset the bit to
Junio C Hamano076ffcc2013-02-06 05:13:2187tell Git when you change the working tree file. This is
Junio C Hamano7e9f6b72006-02-22 10:44:5588sometimes helpful when working with a big project on a
89filesystem that has very slow lstat(2) system call
90(e.g. cifs).
Junio C Hamano915cd9b2008-07-20 01:24:1791+
92This option can be also used as a coarse file-level mechanism
93to ignore uncommitted changes in tracked files (akin to what
94`.gitignore` does for untracked files).
Junio C Hamano915cd9b2008-07-20 01:24:1795Git will fail (gracefully) in case it needs to modify this file
96in the index e.g. when merging in a commit;
97thus, in case the assumed-untracked file is changed upstream,
98you will need to handle the situation manually.
Junio C Hamano7e9f6b72006-02-22 10:44:5599
Junio C Hamano446ed772009-11-10 22:02:20100--really-refresh::
101Like '--refresh', but checks stat information unconditionally,
102without regard to the "assume unchanged" setting.
103
Junio C Hamano3d1b5a12013-05-17 23:34:02104--[no-]skip-worktree::
Junio C Hamano3c8d6702010-01-13 23:09:03105When one of these flags is specified, the object name recorded
106for the paths are not updated. Instead, these options
107set and unset the "skip-worktree" bit for the paths. See
108section "Skip-worktree bit" below for more information.
109
Junio C Hamanoeb415992008-06-08 22:49:47110-g::
111--again::
Junio C Hamano1aa40d22010-01-21 17:46:43112Runs 'git update-index' itself on the paths whose index
Junio C Hamano26a57372006-05-10 00:13:40113entries are different from those from the `HEAD` commit.
114
Junio C Hamano46338f52006-05-04 00:46:44115--unresolve::
116Restores the 'unmerged' or 'needs updating' state of a
117file during a merge if it was cleared by accident.
118
Junio C Hamano1a4e8412005-12-27 08:17:23119--info-only::
120Do not create objects in the object database for all
121<file> arguments that follow this flag; just insert
122their object IDs into the index.
123
124--force-remove::
125Remove the file from the index even when the working directory
126still has such a file. (Implies --remove.)
127
128--replace::
129By default, when a file `path` exists in the index,
Junio C Hamano1aa40d22010-01-21 17:46:43130'git update-index' refuses an attempt to add `path/file`.
Junio C Hamano1a4e8412005-12-27 08:17:23131Similarly if a file `path/file` exists, a file `path`
132cannot be added. With --replace flag, existing entries
Junio C Hamano54bf1e22008-12-20 06:30:11133that conflict with the entry being added are
Junio C Hamano1a4e8412005-12-27 08:17:23134automatically removed with warning messages.
135
136--stdin::
137Instead of taking list of paths from the command line,
138read list of paths from the standard input. Paths are
139separated by LF (i.e. one path per line) by default.
140
141--verbose::
142 Report what is being added and removed from index.
143
Junio C Hamanob76a6862012-05-02 22:02:46144--index-version <n>::
145Write the resulting index out in the named on-disk format version.
Junio C Hamano947ab822013-03-19 23:07:29146Supported versions are 2, 3 and 4. The current default version is 2
147or 3, depending on whether extra features are used, such as
148`git add -N`.
149+
150Version 4 performs a simple pathname compression that reduces index
151size by 30%-50% on large repositories, which results in faster load
152time. Version 4 is relatively young (first released in in 1.8.0 in
153October 2012). Other Git implementations such as JGit and libgit2
154may not support it yet.
Junio C Hamanob76a6862012-05-02 22:02:46155
Junio C Hamano1a4e8412005-12-27 08:17:23156-z::
Junio C Hamanoc27b7332010-10-14 04:37:28157Only meaningful with `--stdin` or `--index-info`; paths are
158separated with NUL character instead of LF.
Junio C Hamano1a4e8412005-12-27 08:17:23159
Junio C Hamano1bb569e2006-05-05 23:14:25160\--::
Junio C Hamano1a4e8412005-12-27 08:17:23161Do not interpret any more arguments as options.
162
163<file>::
164Files to act on.
165Note that files beginning with '.' are discarded. This includes
Junio C Hamanoa77a5132007-06-08 16:13:44166`./file` and `dir/./file`. If you don't want this, then use
Junio C Hamano1a4e8412005-12-27 08:17:23167cleaner names.
168The same applies to directories ending '/' and paths with '//'
169
170Using --refresh
171---------------
172'--refresh' does not calculate a new sha1 file or bring the index
173up-to-date for mode/content changes. But what it *does* do is to
174"re-match" the stat information of a file with the index, so that you
175can refresh the index for a file that hasn't been changed but where
176the stat entry is out of date.
177
Junio C Hamano1aa40d22010-01-21 17:46:43178For example, you'd want to do this after doing a 'git read-tree', to link
Junio C Hamano1a4e8412005-12-27 08:17:23179up the stat index details with the proper files.
180
181Using --cacheinfo or --info-only
182--------------------------------
183'--cacheinfo' is used to register a file that is not in the
184current working directory. This is useful for minimum-checkout
185merging.
186
187To pretend you have a file with mode and sha1 at path, say:
188
189----------------
Junio C Hamanofce7c7e2008-07-02 03:06:38190$ git update-index --cacheinfo mode sha1 path
Junio C Hamano1a4e8412005-12-27 08:17:23191----------------
192
193'--info-only' is used to register files without placing them in the object
194database. This is useful for status-only repositories.
195
196Both '--cacheinfo' and '--info-only' behave similarly: the index is updated
197but the object database isn't. '--cacheinfo' is useful when the object is
198in the database but the file isn't available locally. '--info-only' is
199useful when the file is available, but you do not wish to update the
200object database.
201
202
203Using --index-info
204------------------
205
206`--index-info` is a more powerful mechanism that lets you feed
207multiple entry definitions from the standard input, and designed
208specifically for scripts. It can take inputs of three formats:
209
210 . mode SP sha1 TAB path
211+
212The first format is what "git-apply --index-info"
213reports, and used to reconstruct a partial tree
214that is used for phony merge base tree when falling
215back on 3-way merge.
216
217 . mode SP type SP sha1 TAB path
218+
Junio C Hamano1aa40d22010-01-21 17:46:43219The second format is to stuff 'git ls-tree' output
Junio C Hamano1a4e8412005-12-27 08:17:23220into the index file.
221
222 . mode SP sha1 SP stage TAB path
223+
224This format is to put higher order stages into the
Junio C Hamano1aa40d22010-01-21 17:46:43225index file and matches 'git ls-files --stage' output.
Junio C Hamano1a4e8412005-12-27 08:17:23226
227To place a higher stage entry to the index, the path should
228first be removed by feeding a mode=0 entry for the path, and
229then feeding necessary input lines in the third format.
230
231For example, starting with this index:
232
233------------
234$ git ls-files -s
235100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz
236------------
237
238you can feed the following input to `--index-info`:
239
240------------
241$ git update-index --index-info
2420 0000000000000000000000000000000000000000 frotz
243100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
244100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
245------------
246
247The first line of the input feeds 0 as the mode to remove the
Junio C Hamanoe3f080d2013-04-22 02:27:13248path; the SHA-1 does not matter as long as it is well formatted.
Junio C Hamano1a4e8412005-12-27 08:17:23249Then the second and third line feeds stage 1 and stage 2 entries
250for that path. After the above, we would end up with this:
251
252------------
253$ git ls-files -s
254100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
255100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
256------------
257
258
Junio C Hamanofb2ead32006-11-13 23:40:59259Using ``assume unchanged'' bit
260------------------------------
Junio C Hamano7e9f6b72006-02-22 10:44:55261
Junio C Hamano076ffcc2013-02-06 05:13:21262Many operations in Git depend on your filesystem to have an
Junio C Hamano7e9f6b72006-02-22 10:44:55263efficient `lstat(2)` implementation, so that `st_mtime`
264information for working tree files can be cheaply checked to see
265if the file contents have changed from the version recorded in
266the index file. Unfortunately, some filesystems have
267inefficient `lstat(2)`. If your filesystem is one of them, you
268can set "assume unchanged" bit to paths you have not changed to
Junio C Hamano076ffcc2013-02-06 05:13:21269cause Git not to do this check. Note that setting this bit on a
270path does not mean Git will check the contents of the file to
271see if it has changed -- it makes Git to omit any checking and
Junio C Hamano7e9f6b72006-02-22 10:44:55272assume it has *not* changed. When you make changes to working
Junio C Hamano076ffcc2013-02-06 05:13:21273tree files, you have to explicitly tell Git about it by dropping
Junio C Hamano7e9f6b72006-02-22 10:44:55274"assume unchanged" bit, either before or after you modify them.
275
276In order to set "assume unchanged" bit, use `--assume-unchanged`
Junio C Hamano8fb66e52011-10-05 20:59:51277option. To unset, use `--no-assume-unchanged`. To see which files
278have the "assume unchanged" bit set, use `git ls-files -v`
279(see linkgit:git-ls-files[1]).
Junio C Hamano7e9f6b72006-02-22 10:44:55280
281The command looks at `core.ignorestat` configuration variable. When
Junio C Hamanofce7c7e2008-07-02 03:06:38282this is true, paths updated with `git update-index paths...` and
Junio C Hamano076ffcc2013-02-06 05:13:21283paths updated with other Git commands that update both index and
Junio C Hamano1aa40d22010-01-21 17:46:43284working tree (e.g. 'git apply --index', 'git checkout-index -u',
285and 'git read-tree -u') are automatically marked as "assume
Junio C Hamano7e9f6b72006-02-22 10:44:55286unchanged". Note that "assume unchanged" bit is *not* set if
Junio C Hamanofce7c7e2008-07-02 03:06:38287`git update-index --refresh` finds the working tree file matches
288the index (use `git update-index --really-refresh` if you want
Junio C Hamano7e9f6b72006-02-22 10:44:55289to mark them as "assume unchanged").
290
291
Junio C Hamano1a4e8412005-12-27 08:17:23292Examples
293--------
294To update and refresh only the files already checked out:
295
296----------------
Junio C Hamanofce7c7e2008-07-02 03:06:38297$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh
Junio C Hamano1a4e8412005-12-27 08:17:23298----------------
299
Junio C Hamanoc8d88c22006-04-29 07:02:01300On an inefficient filesystem with `core.ignorestat` set::
301+
Junio C Hamano7e9f6b72006-02-22 10:44:55302------------
Junio C Hamanoc8d88c22006-04-29 07:02:01303$ git update-index --really-refresh <1>
304$ git update-index --no-assume-unchanged foo.c <2>
305$ git diff --name-only <3>
Junio C Hamano7e9f6b72006-02-22 10:44:55306$ edit foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01307$ git diff --name-only <4>
Junio C Hamano7e9f6b72006-02-22 10:44:55308M foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01309$ git update-index foo.c <5>
310$ git diff --name-only <6>
Junio C Hamano7e9f6b72006-02-22 10:44:55311$ edit foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01312$ git diff --name-only <7>
313$ git update-index --no-assume-unchanged foo.c <8>
314$ git diff --name-only <9>
Junio C Hamano7e9f6b72006-02-22 10:44:55315M foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01316------------
317+
318<1> forces lstat(2) to set "assume unchanged" bits for paths that match index.
Junio C Hamano7e9f6b72006-02-22 10:44:55319<2> mark the path to be edited.
320<3> this does lstat(2) and finds index matches the path.
Junio C Hamanoc8d88c22006-04-29 07:02:01321<4> this does lstat(2) and finds index does *not* match the path.
Junio C Hamano7e9f6b72006-02-22 10:44:55322<5> registering the new version to index sets "assume unchanged" bit.
323<6> and it is assumed unchanged.
324<7> even after you edit it.
325<8> you can tell about the change after the fact.
326<9> now it checks with lstat(2) and finds it has been changed.
Junio C Hamano7e9f6b72006-02-22 10:44:55327
Junio C Hamano1a4e8412005-12-27 08:17:23328
Junio C Hamano3c8d6702010-01-13 23:09:03329Skip-worktree bit
330-----------------
331
332Skip-worktree bit can be defined in one (long) sentence: When reading
333an entry, if it is marked as skip-worktree, then Git pretends its
334working directory version is up to date and read the index version
335instead.
336
337To elaborate, "reading" means checking for file existence, reading
338file attributes or file content. The working directory version may be
339present or absent. If present, its content may match against the index
340version or not. Writing is not affected by this bit, content safety
341is still first priority. Note that Git _can_ update working directory
342file, that is marked skip-worktree, if it is safe to do so (i.e.
343working directory version matches index version)
344
345Although this bit looks similar to assume-unchanged bit, its goal is
346different from assume-unchanged bit's. Skip-worktree also takes
347precedence over assume-unchanged bit when both are set.
348
349
Junio C Hamano1a4e8412005-12-27 08:17:23350Configuration
351-------------
352
353The command honors `core.filemode` configuration variable. If
Junio C Hamano446ed772009-11-10 22:02:20354your repository is on a filesystem whose executable bits are
Junio C Hamano35738e82008-01-07 07:55:46355unreliable, this should be set to 'false' (see linkgit:git-config[1]).
Junio C Hamano1a4e8412005-12-27 08:17:23356This causes the command to ignore differences in file modes recorded
357in the index and the file mode on the filesystem if they differ only on
358executable bit. On such an unfortunate filesystem, you may
Junio C Hamano1aa40d22010-01-21 17:46:43359need to use 'git update-index --chmod='.
Junio C Hamano1a4e8412005-12-27 08:17:23360
Junio C Hamanoaa83a7d2007-03-05 02:37:29361Quite similarly, if `core.symlinks` configuration variable is set
Junio C Hamano35738e82008-01-07 07:55:46362to 'false' (see linkgit:git-config[1]), symbolic links are checked out
Junio C Hamanoaa83a7d2007-03-05 02:37:29363as plain files, and this command does not modify a recorded file mode
364from symbolic link to regular file.
365
Junio C Hamano7e9f6b72006-02-22 10:44:55366The command looks at `core.ignorestat` configuration variable. See
367'Using "assume unchanged" bit' section above.
368
Junio C Hamano90ccff32008-07-29 08:17:24369The command also looks at `core.trustctime` configuration variable.
370It can be useful when the inode change time is regularly modified by
371something outside Git (file system crawlers and backup systems use
372ctime for marking files processed) (see linkgit:git-config[1]).
373
Junio C Hamano1a4e8412005-12-27 08:17:23374
Junio C Hamano9049d912008-05-29 02:09:50375SEE ALSO
Junio C Hamano1a4e8412005-12-27 08:17:23376--------
Junio C Hamano35738e82008-01-07 07:55:46377linkgit:git-config[1],
Junio C Hamano8fb66e52011-10-05 20:59:51378linkgit:git-add[1],
379linkgit:git-ls-files[1]
Junio C Hamano1a4e8412005-12-27 08:17:23380
Junio C Hamano1a4e8412005-12-27 08:17:23381GIT
382---
Junio C Hamanof7c042d2008-06-06 22:50:53383Part of the linkgit:git[1] suite