blob: cd5e014d4899954b204173f6e1d84e011a307ac8 [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 Hamano1a4e8412005-12-27 08:17:2312'git-update-index'
Junio C Hamano46338f52006-05-04 00:46:4413 [--add] [--remove | --force-remove] [--replace]
14 [--refresh] [-q] [--unmerged] [--ignore-missing]
Junio C Hamano1a4e8412005-12-27 08:17:2315 [--cacheinfo <mode> <object> <file>]\*
16 [--chmod=(+|-)x]
Junio C Hamano7e9f6b72006-02-22 10:44:5517 [--assume-unchanged | --no-assume-unchanged]
Junio C Hamano8a0a21e2006-08-24 07:37:4518 [--really-refresh] [--unresolve] [--again | -g]
Junio C Hamano1a4e8412005-12-27 08:17:2319 [--info-only] [--index-info]
20 [-z] [--stdin]
21 [--verbose]
22 [--] [<file>]\*
23
24DESCRIPTION
25-----------
26Modifies the index or directory cache. Each file mentioned is updated
27into the index and any 'unmerged' or 'needs updating' state is
28cleared.
29
30The way "git-update-index" handles files it is told about can be modified
31using the various options:
32
33OPTIONS
34-------
35--add::
36If a specified file isn't in the index already then it's
37added.
38Default behaviour is to ignore new files.
39
40--remove::
41If a specified file is in the index but is missing then it's
42removed.
Junio C Hamano341071d2006-06-04 07:24:4843Default behavior is to ignore removed file.
Junio C Hamano1a4e8412005-12-27 08:17:2344
45--refresh::
46Looks at the current index and checks to see if merges or
47updates are needed by checking stat() information.
48
49-q::
50 Quiet. If --refresh finds that the index needs an update, the
51 default behavior is to error out. This option makes
52 git-update-index continue anyway.
53
54--unmerged::
55 If --refresh finds unmerged changes in the index, the default
56 behavior is to error out. This option makes git-update-index
57 continue anyway.
58
59--ignore-missing::
60Ignores missing files during a --refresh
61
62--cacheinfo <mode> <object> <path>::
63Directly insert the specified info into the index.
64
65--index-info::
66 Read index information from stdin.
67
68--chmod=(+|-)x::
69 Set the execute permissions on the updated files.
70
Junio C Hamano7e9f6b72006-02-22 10:44:5571--assume-unchanged, --no-assume-unchanged::
72When these flags are specified, the object name recorded
73for the paths are not updated. Instead, these options
74sets and unsets the "assume unchanged" bit for the
75paths. When the "assume unchanged" bit is on, git stops
76checking the working tree files for possible
77modifications, so you need to manually unset the bit to
78tell git when you change the working tree file. This is
79sometimes helpful when working with a big project on a
80filesystem that has very slow lstat(2) system call
81(e.g. cifs).
82
Junio C Hamano8a0a21e2006-08-24 07:37:4583--again, -g::
Junio C Hamano26a57372006-05-10 00:13:4084Runs `git-update-index` itself on the paths whose index
85entries are different from those from the `HEAD` commit.
86
Junio C Hamano46338f52006-05-04 00:46:4487--unresolve::
88Restores the 'unmerged' or 'needs updating' state of a
89file during a merge if it was cleared by accident.
90
Junio C Hamano1a4e8412005-12-27 08:17:2391--info-only::
92Do not create objects in the object database for all
93<file> arguments that follow this flag; just insert
94their object IDs into the index.
95
96--force-remove::
97Remove the file from the index even when the working directory
98still has such a file. (Implies --remove.)
99
100--replace::
101By default, when a file `path` exists in the index,
102git-update-index refuses an attempt to add `path/file`.
103Similarly if a file `path/file` exists, a file `path`
104cannot be added. With --replace flag, existing entries
105that conflicts with the entry being added are
106automatically removed with warning messages.
107
108--stdin::
109Instead of taking list of paths from the command line,
110read list of paths from the standard input. Paths are
111separated by LF (i.e. one path per line) by default.
112
113--verbose::
114 Report what is being added and removed from index.
115
116-z::
117Only meaningful with `--stdin`; paths are separated with
118NUL character instead of LF.
119
Junio C Hamano1bb569e2006-05-05 23:14:25120\--::
Junio C Hamano1a4e8412005-12-27 08:17:23121Do not interpret any more arguments as options.
122
123<file>::
124Files to act on.
125Note that files beginning with '.' are discarded. This includes
126`./file` and `dir/./file`. If you don't want this, then use
127cleaner names.
128The same applies to directories ending '/' and paths with '//'
129
130Using --refresh
131---------------
132'--refresh' does not calculate a new sha1 file or bring the index
133up-to-date for mode/content changes. But what it *does* do is to
134"re-match" the stat information of a file with the index, so that you
135can refresh the index for a file that hasn't been changed but where
136the stat entry is out of date.
137
138For example, you'd want to do this after doing a "git-read-tree", to link
139up the stat index details with the proper files.
140
141Using --cacheinfo or --info-only
142--------------------------------
143'--cacheinfo' is used to register a file that is not in the
144current working directory. This is useful for minimum-checkout
145merging.
146
147To pretend you have a file with mode and sha1 at path, say:
148
149----------------
150$ git-update-index --cacheinfo mode sha1 path
151----------------
152
153'--info-only' is used to register files without placing them in the object
154database. This is useful for status-only repositories.
155
156Both '--cacheinfo' and '--info-only' behave similarly: the index is updated
157but the object database isn't. '--cacheinfo' is useful when the object is
158in the database but the file isn't available locally. '--info-only' is
159useful when the file is available, but you do not wish to update the
160object database.
161
162
163Using --index-info
164------------------
165
166`--index-info` is a more powerful mechanism that lets you feed
167multiple entry definitions from the standard input, and designed
168specifically for scripts. It can take inputs of three formats:
169
170 . mode SP sha1 TAB path
171+
172The first format is what "git-apply --index-info"
173reports, and used to reconstruct a partial tree
174that is used for phony merge base tree when falling
175back on 3-way merge.
176
177 . mode SP type SP sha1 TAB path
178+
179The second format is to stuff git-ls-tree output
180into the index file.
181
182 . mode SP sha1 SP stage TAB path
183+
184This format is to put higher order stages into the
185index file and matches git-ls-files --stage output.
186
187To place a higher stage entry to the index, the path should
188first be removed by feeding a mode=0 entry for the path, and
189then feeding necessary input lines in the third format.
190
191For example, starting with this index:
192
193------------
194$ git ls-files -s
195100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0 frotz
196------------
197
198you can feed the following input to `--index-info`:
199
200------------
201$ git update-index --index-info
2020 0000000000000000000000000000000000000000 frotz
203100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
204100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
205------------
206
207The first line of the input feeds 0 as the mode to remove the
208path; the SHA1 does not matter as long as it is well formatted.
209Then the second and third line feeds stage 1 and stage 2 entries
210for that path. After the above, we would end up with this:
211
212------------
213$ git ls-files -s
214100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1 frotz
215100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz
216------------
217
218
Junio C Hamanofb2ead32006-11-13 23:40:59219Using ``assume unchanged'' bit
220------------------------------
Junio C Hamano7e9f6b72006-02-22 10:44:55221
222Many operations in git depend on your filesystem to have an
223efficient `lstat(2)` implementation, so that `st_mtime`
224information for working tree files can be cheaply checked to see
225if the file contents have changed from the version recorded in
226the index file. Unfortunately, some filesystems have
227inefficient `lstat(2)`. If your filesystem is one of them, you
228can set "assume unchanged" bit to paths you have not changed to
229cause git not to do this check. Note that setting this bit on a
230path does not mean git will check the contents of the file to
231see if it has changed -- it makes git to omit any checking and
232assume it has *not* changed. When you make changes to working
233tree files, you have to explicitly tell git about it by dropping
234"assume unchanged" bit, either before or after you modify them.
235
236In order to set "assume unchanged" bit, use `--assume-unchanged`
237option. To unset, use `--no-assume-unchanged`.
238
239The command looks at `core.ignorestat` configuration variable. When
240this is true, paths updated with `git-update-index paths...` and
241paths updated with other git commands that update both index and
242working tree (e.g. `git-apply --index`, `git-checkout-index -u`,
243and `git-read-tree -u`) are automatically marked as "assume
244unchanged". Note that "assume unchanged" bit is *not* set if
245`git-update-index --refresh` finds the working tree file matches
246the index (use `git-update-index --really-refresh` if you want
247to mark them as "assume unchanged").
248
249
Junio C Hamano1a4e8412005-12-27 08:17:23250Examples
251--------
252To update and refresh only the files already checked out:
253
254----------------
255$ git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh
256----------------
257
Junio C Hamanoc8d88c22006-04-29 07:02:01258On an inefficient filesystem with `core.ignorestat` set::
259+
Junio C Hamano7e9f6b72006-02-22 10:44:55260------------
Junio C Hamanoc8d88c22006-04-29 07:02:01261$ git update-index --really-refresh <1>
262$ git update-index --no-assume-unchanged foo.c <2>
263$ git diff --name-only <3>
Junio C Hamano7e9f6b72006-02-22 10:44:55264$ edit foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01265$ git diff --name-only <4>
Junio C Hamano7e9f6b72006-02-22 10:44:55266M foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01267$ git update-index foo.c <5>
268$ git diff --name-only <6>
Junio C Hamano7e9f6b72006-02-22 10:44:55269$ edit foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01270$ git diff --name-only <7>
271$ git update-index --no-assume-unchanged foo.c <8>
272$ git diff --name-only <9>
Junio C Hamano7e9f6b72006-02-22 10:44:55273M foo.c
Junio C Hamanoc8d88c22006-04-29 07:02:01274------------
275+
276<1> forces lstat(2) to set "assume unchanged" bits for paths that match index.
Junio C Hamano7e9f6b72006-02-22 10:44:55277<2> mark the path to be edited.
278<3> this does lstat(2) and finds index matches the path.
Junio C Hamanoc8d88c22006-04-29 07:02:01279<4> this does lstat(2) and finds index does *not* match the path.
Junio C Hamano7e9f6b72006-02-22 10:44:55280<5> registering the new version to index sets "assume unchanged" bit.
281<6> and it is assumed unchanged.
282<7> even after you edit it.
283<8> you can tell about the change after the fact.
284<9> now it checks with lstat(2) and finds it has been changed.
Junio C Hamano7e9f6b72006-02-22 10:44:55285
Junio C Hamano1a4e8412005-12-27 08:17:23286
287Configuration
288-------------
289
290The command honors `core.filemode` configuration variable. If
291your repository is on an filesystem whose executable bits are
Junio C Hamano7ad22dc2007-01-29 02:55:48292unreliable, this should be set to 'false' (see gitlink:git-config[1]).
Junio C Hamano1a4e8412005-12-27 08:17:23293This causes the command to ignore differences in file modes recorded
294in the index and the file mode on the filesystem if they differ only on
295executable bit. On such an unfortunate filesystem, you may
296need to use `git-update-index --chmod=`.
297
Junio C Hamanoaa83a7d2007-03-05 02:37:29298Quite similarly, if `core.symlinks` configuration variable is set
299to 'false' (see gitlink:git-config[1]), symbolic links are checked out
300as plain files, and this command does not modify a recorded file mode
301from symbolic link to regular file.
302
Junio C Hamano7e9f6b72006-02-22 10:44:55303The command looks at `core.ignorestat` configuration variable. See
304'Using "assume unchanged" bit' section above.
305
Junio C Hamano1a4e8412005-12-27 08:17:23306
307See Also
308--------
Junio C Hamano7ad22dc2007-01-29 02:55:48309gitlink:git-config[1]
Junio C Hamano1a4e8412005-12-27 08:17:23310
311
312Author
313------
314Written by Linus Torvalds <torvalds@osdl.org>
315
316Documentation
317--------------
318Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
319
320GIT
321---
322Part of the gitlink:git[7] suite
323