blob: 9d0b1515c58dc825beef6b4507542572c51ca988 [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 Hamano7e9f6b72006-02-22 10:44:5585paths. When the "assume unchanged" bit is on, git stops
86checking the working tree files for possible
87modifications, so you need to manually unset the bit to
88tell git when you change the working tree file. This is
89sometimes 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.
148The current default version is 2.
149
Junio C Hamano1a4e8412005-12-27 08:17:23150-z::
Junio C Hamanoc27b7332010-10-14 04:37:28151Only meaningful with `--stdin` or `--index-info`; paths are
152separated with NUL character instead of LF.
Junio C Hamano1a4e8412005-12-27 08:17:23153
Junio C Hamano1bb569e2006-05-05 23:14:25154\--::
Junio C Hamano1a4e8412005-12-27 08:17:23155Do not interpret any more arguments as options.
156
157<file>::
158Files to act on.
159Note that files beginning with '.' are discarded. This includes
Junio C Hamanoa77a5132007-06-08 16:13:44160`./file` and `dir/./file`. If you don't want this, then use
Junio C Hamano1a4e8412005-12-27 08:17:23161cleaner names.
162The same applies to directories ending '/' and paths with '//'
163
164Using --refresh
165---------------
166'--refresh' does not calculate a new sha1 file or bring the index
167up-to-date for mode/content changes. But what it *does* do is to
168"re-match" the stat information of a file with the index, so that you
169can refresh the index for a file that hasn't been changed but where
170the stat entry is out of date.
171
Junio C Hamano1aa40d22010-01-21 17:46:43172For example, you'd want to do this after doing a 'git read-tree', to link
Junio C Hamano1a4e8412005-12-27 08:17:23173up the stat index details with the proper files.
174
175Using --cacheinfo or --info-only
176--------------------------------
177'--cacheinfo' is used to register a file that is not in the
178current working directory. This is useful for minimum-checkout
179merging.
180
181To pretend you have a file with mode and sha1 at path, say:
182
183----------------
Junio C Hamanofce7c7e2008-07-02 03:06:38184$ git update-index --cacheinfo mode sha1 path
Junio C Hamano1a4e8412005-12-27 08:17:23185----------------
186
187'--info-only' is used to register files without placing them in the object
188database. This is useful for status-only repositories.
189
190Both '--cacheinfo' and '--info-only' behave similarly: the index is updated
191but the object database isn't. '--cacheinfo' is useful when the object is
192in the database but the file isn't available locally. '--info-only' is
193useful when the file is available, but you do not wish to update the
194object database.
195
196
197Using --index-info
198------------------
199
200`--index-info` is a more powerful mechanism that lets you feed
201multiple entry definitions from the standard input, and designed
202specifically for scripts. It can take inputs of three formats:
203
204 . mode SP sha1 TAB path
205+
206The first format is what "git-apply --index-info"
207reports, and used to reconstruct a partial tree
208that is used for phony merge base tree when falling
209back on 3-way merge.
210
211 . mode SP type SP sha1 TAB path
212+
Junio C Hamano1aa40d22010-01-21 17:46:43213The second format is to stuff 'git ls-tree' output
Junio C Hamano1a4e8412005-12-27 08:17:23214into the index file.
215
216 . mode SP sha1 SP stage TAB path
217+
218This format is to put higher order stages into the
Junio C Hamano1aa40d22010-01-21 17:46:43219index file and matches 'git ls-files --stage' output.
Junio C Hamano1a4e8412005-12-27 08:17:23220
221To place a higher stage entry to the index, the path should
222first be removed by feeding a mode=0 entry for the path, and
223then feeding necessary input lines in the third format.
224
225For example, starting with this index:
226
227------------
228$ git ls-files -s
229100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz
230------------
231
232you can feed the following input to `--index-info`:
233
234------------
235$ git update-index --index-info
2360 0000000000000000000000000000000000000000 frotz
237100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
238100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
239------------
240
241The first line of the input feeds 0 as the mode to remove the
242path; the SHA1 does not matter as long as it is well formatted.
243Then the second and third line feeds stage 1 and stage 2 entries
244for that path. After the above, we would end up with this:
245
246------------
247$ git ls-files -s
248100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
249100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
250------------
251
252
Junio C Hamanofb2ead32006-11-13 23:40:59253Using ``assume unchanged'' bit
254------------------------------
Junio C Hamano7e9f6b72006-02-22 10:44:55255
256Many operations in git depend on your filesystem to have an
257efficient `lstat(2)` implementation, so that `st_mtime`
258information for working tree files can be cheaply checked to see
259if the file contents have changed from the version recorded in
260the index file. Unfortunately, some filesystems have
261inefficient `lstat(2)`. If your filesystem is one of them, you
262can set "assume unchanged" bit to paths you have not changed to
263cause git not to do this check. Note that setting this bit on a
264path does not mean git will check the contents of the file to
265see if it has changed -- it makes git to omit any checking and
266assume it has *not* changed. When you make changes to working
267tree files, you have to explicitly tell git about it by dropping
268"assume unchanged" bit, either before or after you modify them.
269
270In order to set "assume unchanged" bit, use `--assume-unchanged`
Junio C Hamano8fb66e52011-10-05 20:59:51271option. To unset, use `--no-assume-unchanged`. To see which files
272have the "assume unchanged" bit set, use `git ls-files -v`
273(see linkgit:git-ls-files[1]).
Junio C Hamano7e9f6b72006-02-22 10:44:55274
275The command looks at `core.ignorestat` configuration variable. When
Junio C Hamanofce7c7e2008-07-02 03:06:38276this is true, paths updated with `git update-index paths...` and
Junio C Hamano7e9f6b72006-02-22 10:44:55277paths updated with other git commands that update both index and
Junio C Hamano1aa40d22010-01-21 17:46:43278working tree (e.g. 'git apply --index', 'git checkout-index -u',
279and 'git read-tree -u') are automatically marked as "assume
Junio C Hamano7e9f6b72006-02-22 10:44:55280unchanged". Note that "assume unchanged" bit is *not* set if
Junio C Hamanofce7c7e2008-07-02 03:06:38281`git update-index --refresh` finds the working tree file matches
282the index (use `git update-index --really-refresh` if you want
Junio C Hamano7e9f6b72006-02-22 10:44:55283to mark them as "assume unchanged").
284
285
Junio C Hamano1a4e8412005-12-27 08:17:23286Examples
287--------
288To update and refresh only the files already checked out:
289
290----------------
Junio C Hamanofce7c7e2008-07-02 03:06:38291$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh
Junio C Hamano1a4e8412005-12-27 08:17:23292----------------
293
Junio C Hamanoc8d88c22006-04-29 07:02:01294On an inefficient filesystem with `core.ignorestat` set::
295+
Junio C Hamano7e9f6b72006-02-22 10:44:55296------------
Junio C Hamanoc8d88c22006-04-29 07:02:01297$ git update-index --really-refresh <1>
298$ git update-index --no-assume-unchanged foo.c <2>
299$ git diff --name-only <3>
Junio C Hamano7e9f6b72006-02-22 10:44:55300$ edit foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01301$ git diff --name-only <4>
Junio C Hamano7e9f6b72006-02-22 10:44:55302M foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01303$ git update-index foo.c <5>
304$ git diff --name-only <6>
Junio C Hamano7e9f6b72006-02-22 10:44:55305$ edit foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01306$ git diff --name-only <7>
307$ git update-index --no-assume-unchanged foo.c <8>
308$ git diff --name-only <9>
Junio C Hamano7e9f6b72006-02-22 10:44:55309M foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01310------------
311+
312<1> forces lstat(2) to set "assume unchanged" bits for paths that match index.
Junio C Hamano7e9f6b72006-02-22 10:44:55313<2> mark the path to be edited.
314<3> this does lstat(2) and finds index matches the path.
Junio C Hamanoc8d88c22006-04-29 07:02:01315<4> this does lstat(2) and finds index does *not* match the path.
Junio C Hamano7e9f6b72006-02-22 10:44:55316<5> registering the new version to index sets "assume unchanged" bit.
317<6> and it is assumed unchanged.
318<7> even after you edit it.
319<8> you can tell about the change after the fact.
320<9> now it checks with lstat(2) and finds it has been changed.
Junio C Hamano7e9f6b72006-02-22 10:44:55321
Junio C Hamano1a4e8412005-12-27 08:17:23322
Junio C Hamano3c8d6702010-01-13 23:09:03323Skip-worktree bit
324-----------------
325
326Skip-worktree bit can be defined in one (long) sentence: When reading
327an entry, if it is marked as skip-worktree, then Git pretends its
328working directory version is up to date and read the index version
329instead.
330
331To elaborate, "reading" means checking for file existence, reading
332file attributes or file content. The working directory version may be
333present or absent. If present, its content may match against the index
334version or not. Writing is not affected by this bit, content safety
335is still first priority. Note that Git _can_ update working directory
336file, that is marked skip-worktree, if it is safe to do so (i.e.
337working directory version matches index version)
338
339Although this bit looks similar to assume-unchanged bit, its goal is
340different from assume-unchanged bit's. Skip-worktree also takes
341precedence over assume-unchanged bit when both are set.
342
343
Junio C Hamano1a4e8412005-12-27 08:17:23344Configuration
345-------------
346
347The command honors `core.filemode` configuration variable. If
Junio C Hamano446ed772009-11-10 22:02:20348your repository is on a filesystem whose executable bits are
Junio C Hamano35738e82008-01-07 07:55:46349unreliable, this should be set to 'false' (see linkgit:git-config[1]).
Junio C Hamano1a4e8412005-12-27 08:17:23350This causes the command to ignore differences in file modes recorded
351in the index and the file mode on the filesystem if they differ only on
352executable bit. On such an unfortunate filesystem, you may
Junio C Hamano1aa40d22010-01-21 17:46:43353need to use 'git update-index --chmod='.
Junio C Hamano1a4e8412005-12-27 08:17:23354
Junio C Hamanoaa83a7d2007-03-05 02:37:29355Quite similarly, if `core.symlinks` configuration variable is set
Junio C Hamano35738e82008-01-07 07:55:46356to 'false' (see linkgit:git-config[1]), symbolic links are checked out
Junio C Hamanoaa83a7d2007-03-05 02:37:29357as plain files, and this command does not modify a recorded file mode
358from symbolic link to regular file.
359
Junio C Hamano7e9f6b72006-02-22 10:44:55360The command looks at `core.ignorestat` configuration variable. See
361'Using "assume unchanged" bit' section above.
362
Junio C Hamano90ccff32008-07-29 08:17:24363The command also looks at `core.trustctime` configuration variable.
364It can be useful when the inode change time is regularly modified by
365something outside Git (file system crawlers and backup systems use
366ctime for marking files processed) (see linkgit:git-config[1]).
367
Junio C Hamano1a4e8412005-12-27 08:17:23368
Junio C Hamano9049d912008-05-29 02:09:50369SEE ALSO
Junio C Hamano1a4e8412005-12-27 08:17:23370--------
Junio C Hamano35738e82008-01-07 07:55:46371linkgit:git-config[1],
Junio C Hamano8fb66e52011-10-05 20:59:51372linkgit:git-add[1],
373linkgit:git-ls-files[1]
Junio C Hamano1a4e8412005-12-27 08:17:23374
Junio C Hamano1a4e8412005-12-27 08:17:23375GIT
376---
Junio C Hamanof7c042d2008-06-06 22:50:53377Part of the linkgit:git[1] suite