]>
Commit | Line | Data |
---|---|---|
6e411d20 SP |
1 | git-fast-import(1) |
2 | ================== | |
3 | ||
4 | NAME | |
5 | ---- | |
7a33631f | 6 | git-fast-import - Backend for fast Git data importers |
6e411d20 SP |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
b1889c36 | 11 | frontend | 'git fast-import' [options] |
6e411d20 SP |
12 | |
13 | DESCRIPTION | |
14 | ----------- | |
15 | This program is usually not what the end user wants to run directly. | |
16 | Most end users want to use one of the existing frontend programs, | |
17 | which parses a specific type of foreign source and feeds the contents | |
0b444cdb | 18 | stored there to 'git fast-import'. |
6e411d20 | 19 | |
882227f1 | 20 | fast-import reads a mixed command/data stream from standard input and |
6e411d20 SP |
21 | writes one or more packfiles directly into the current repository. |
22 | When EOF is received on standard input, fast import writes out | |
23 | updated branch and tag refs, fully updating the current repository | |
24 | with the newly imported data. | |
25 | ||
882227f1 | 26 | The fast-import backend itself can import into an empty repository (one that |
0b444cdb | 27 | has already been initialized by 'git init') or incrementally |
6e411d20 SP |
28 | update an existing populated repository. Whether or not incremental |
29 | imports are supported from a particular foreign source depends on | |
30 | the frontend program in use. | |
31 | ||
32 | ||
33 | OPTIONS | |
34 | ------- | |
63e0c8b3 SP |
35 | --date-format=<fmt>:: |
36 | Specify the type of dates the frontend will supply to | |
882227f1 | 37 | fast-import within `author`, `committer` and `tagger` commands. |
63e0c8b3 SP |
38 | See ``Date Formats'' below for details about which formats |
39 | are supported, and their syntax. | |
40 | ||
7073e69e SP |
41 | --force:: |
42 | Force updating modified existing branches, even if doing | |
43 | so would cause commits to be lost (as the new commit does | |
44 | not contain the old commit). | |
45 | ||
6e411d20 | 46 | --max-pack-size=<n>:: |
4d0cc224 | 47 | Maximum size of each output packfile. |
89e0a3a1 | 48 | The default is unlimited. |
6e411d20 | 49 | |
5eef828b SP |
50 | --big-file-threshold=<n>:: |
51 | Maximum size of a blob that fast-import will attempt to | |
52 | create a delta for, expressed in bytes. The default is 512m | |
53 | (512 MiB). Some importers may wish to lower this on systems | |
54 | with constrained memory. | |
55 | ||
6e411d20 SP |
56 | --depth=<n>:: |
57 | Maximum delta depth, for blob and tree deltification. | |
58 | Default is 10. | |
59 | ||
60 | --active-branches=<n>:: | |
61 | Maximum number of branches to maintain active at once. | |
62 | See ``Memory Utilization'' below for details. Default is 5. | |
63 | ||
64 | --export-marks=<file>:: | |
65 | Dumps the internal marks table to <file> when complete. | |
66 | Marks are written one per line as `:markid SHA-1`. | |
67 | Frontends can use this file to validate imports after they | |
e8438420 SP |
68 | have been completed, or to save the marks table across |
69 | incremental runs. As <file> is only opened and truncated | |
70 | at checkpoint (or completion) the same path can also be | |
71 | safely given to \--import-marks. | |
72 | ||
73 | --import-marks=<file>:: | |
74 | Before processing any input, load the marks specified in | |
75 | <file>. The input file must exist, must be readable, and | |
76 | must use the same format as produced by \--export-marks. | |
77 | Multiple options may be supplied to import more than one | |
78 | set of marks. If a mark is defined to different values, | |
79 | the last file wins. | |
6e411d20 | 80 | |
dded4f12 RR |
81 | --import-marks-if-exists=<file>:: |
82 | Like --import-marks but instead of erroring out, silently | |
83 | skips the file if it does not exist. | |
84 | ||
bc3c79ae | 85 | --relative-marks:: |
9fee24ca | 86 | After specifying --relative-marks the paths specified |
bc3c79ae SR |
87 | with --import-marks= and --export-marks= are relative |
88 | to an internal directory in the current repository. | |
89 | In git-fast-import this means that the paths are relative | |
90 | to the .git/info/fast-import directory. However, other | |
91 | importers may use a different location. | |
92 | ||
93 | --no-relative-marks:: | |
94 | Negates a previous --relative-marks. Allows for combining | |
95 | relative and non-relative marks by interweaving | |
9fee24ca | 96 | --(no-)-relative-marks with the --(import|export)-marks= |
bc3c79ae SR |
97 | options. |
98 | ||
85c62395 DB |
99 | --cat-blob-fd=<fd>:: |
100 | Specify the file descriptor that will be written to | |
101 | when the `cat-blob` command is encountered in the stream. | |
102 | The default behaviour is to write to `stdout`. | |
103 | ||
bdf1c06d SP |
104 | --export-pack-edges=<file>:: |
105 | After creating a packfile, print a line of data to | |
106 | <file> listing the filename of the packfile and the last | |
107 | commit on each branch that was written to that packfile. | |
108 | This information may be useful after importing projects | |
109 | whose total object set exceeds the 4 GiB packfile limit, | |
110 | as these commits can be used as edge points during calls | |
0b444cdb | 111 | to 'git pack-objects'. |
bdf1c06d | 112 | |
c499d768 | 113 | --quiet:: |
882227f1 | 114 | Disable all non-fatal output, making fast-import silent when it |
7f9d77f2 | 115 | is successful. This option disables the output shown by |
c499d768 SP |
116 | \--stats. |
117 | ||
118 | --stats:: | |
882227f1 | 119 | Display some basic statistics about the objects fast-import has |
c499d768 | 120 | created, the packfiles they were stored into, and the |
882227f1 | 121 | memory used by fast-import during this run. Showing this output |
c499d768 SP |
122 | is currently the default, but can be disabled with \--quiet. |
123 | ||
124 | ||
6e411d20 SP |
125 | Performance |
126 | ----------- | |
882227f1 | 127 | The design of fast-import allows it to import large projects in a minimum |
6e411d20 | 128 | amount of memory usage and processing time. Assuming the frontend |
882227f1 | 129 | is able to keep up with fast-import and feed it a constant stream of data, |
6e411d20 SP |
130 | import times for projects holding 10+ years of history and containing |
131 | 100,000+ individual commits are generally completed in just 1-2 | |
132 | hours on quite modest (~$2,000 USD) hardware. | |
133 | ||
134 | Most bottlenecks appear to be in foreign source data access (the | |
882227f1 | 135 | source just cannot extract revisions fast enough) or disk IO (fast-import |
6e411d20 SP |
136 | writes as fast as the disk will take the data). Imports will run |
137 | faster if the source data is stored on a different drive than the | |
138 | destination Git repository (due to less IO contention). | |
139 | ||
140 | ||
141 | Development Cost | |
142 | ---------------- | |
882227f1 | 143 | A typical frontend for fast-import tends to weigh in at approximately 200 |
6e411d20 SP |
144 | lines of Perl/Python/Ruby code. Most developers have been able to |
145 | create working importers in just a couple of hours, even though it | |
882227f1 | 146 | is their first exposure to fast-import, and sometimes even to Git. This is |
6e411d20 SP |
147 | an ideal situation, given that most conversion tools are throw-away |
148 | (use once, and never look back). | |
149 | ||
150 | ||
151 | Parallel Operation | |
152 | ------------------ | |
0b444cdb | 153 | Like 'git push' or 'git fetch', imports handled by fast-import are safe to |
6e411d20 | 154 | run alongside parallel `git repack -a -d` or `git gc` invocations, |
0b444cdb | 155 | or any other Git operation (including 'git prune', as loose objects |
882227f1 | 156 | are never used by fast-import). |
6e411d20 | 157 | |
882227f1 SP |
158 | fast-import does not lock the branch or tag refs it is actively importing. |
159 | After the import, during its ref update phase, fast-import tests each | |
7073e69e SP |
160 | existing branch ref to verify the update will be a fast-forward |
161 | update (the commit stored in the ref is contained in the new | |
162 | history of the commit to be written). If the update is not a | |
882227f1 SP |
163 | fast-forward update, fast-import will skip updating that ref and instead |
164 | prints a warning message. fast-import will always attempt to update all | |
7073e69e SP |
165 | branch refs, and does not stop on the first failure. |
166 | ||
6a5d0b0a | 167 | Branch updates can be forced with \--force, but it's recommended that |
c499d768 | 168 | this only be used on an otherwise quiet repository. Using \--force |
7073e69e | 169 | is not necessary for an initial import into an empty repository. |
6e411d20 SP |
170 | |
171 | ||
172 | Technical Discussion | |
173 | -------------------- | |
882227f1 | 174 | fast-import tracks a set of branches in memory. Any branch can be created |
6e411d20 SP |
175 | or modified at any point during the import process by sending a |
176 | `commit` command on the input stream. This design allows a frontend | |
177 | program to process an unlimited number of branches simultaneously, | |
178 | generating commits in the order they are available from the source | |
179 | data. It also simplifies the frontend programs considerably. | |
180 | ||
882227f1 | 181 | fast-import does not use or alter the current working directory, or any |
6e411d20 SP |
182 | file within it. (It does however update the current Git repository, |
183 | as referenced by `GIT_DIR`.) Therefore an import frontend may use | |
184 | the working directory for its own purposes, such as extracting file | |
185 | revisions from the foreign source. This ignorance of the working | |
882227f1 | 186 | directory also allows fast-import to run very quickly, as it does not |
6e411d20 SP |
187 | need to perform any costly file update operations when switching |
188 | between branches. | |
189 | ||
190 | Input Format | |
191 | ------------ | |
192 | With the exception of raw file data (which Git does not interpret) | |
882227f1 | 193 | the fast-import input format is text (ASCII) based. This text based |
6e411d20 SP |
194 | format simplifies development and debugging of frontend programs, |
195 | especially when a higher level language such as Perl, Python or | |
196 | Ruby is being used. | |
197 | ||
882227f1 | 198 | fast-import is very strict about its input. Where we say SP below we mean |
8dc6a373 DB |
199 | *exactly* one space. Likewise LF means one (and only one) linefeed |
200 | and HT one (and only one) horizontal tab. | |
6e411d20 SP |
201 | Supplying additional whitespace characters will cause unexpected |
202 | results, such as branch names or file names with leading or trailing | |
882227f1 | 203 | spaces in their name, or early termination of fast-import when it encounters |
6e411d20 SP |
204 | unexpected input. |
205 | ||
401d53fa SP |
206 | Stream Comments |
207 | ~~~~~~~~~~~~~~~ | |
208 | To aid in debugging frontends fast-import ignores any line that | |
209 | begins with `#` (ASCII pound/hash) up to and including the line | |
210 | ending `LF`. A comment line may contain any sequence of bytes | |
211 | that does not contain an LF and therefore may be used to include | |
212 | any detailed debugging information that might be specific to the | |
213 | frontend and useful when inspecting a fast-import data stream. | |
214 | ||
63e0c8b3 SP |
215 | Date Formats |
216 | ~~~~~~~~~~~~ | |
217 | The following date formats are supported. A frontend should select | |
218 | the format it will use for this import by passing the format name | |
c499d768 | 219 | in the \--date-format=<fmt> command line option. |
63e0c8b3 SP |
220 | |
221 | `raw`:: | |
9b92c82f | 222 | This is the Git native format and is `<time> SP <offutc>`. |
882227f1 | 223 | It is also fast-import's default format, if \--date-format was |
63e0c8b3 SP |
224 | not specified. |
225 | + | |
226 | The time of the event is specified by `<time>` as the number of | |
227 | seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is | |
228 | written as an ASCII decimal integer. | |
229 | + | |
9b92c82f SP |
230 | The local offset is specified by `<offutc>` as a positive or negative |
231 | offset from UTC. For example EST (which is 5 hours behind UTC) | |
232 | would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. | |
233 | The local offset does not affect `<time>`; it is used only as an | |
234 | advisement to help formatting routines display the timestamp. | |
63e0c8b3 | 235 | + |
9b92c82f SP |
236 | If the local offset is not available in the source material, use |
237 | ``+0000'', or the most common local offset. For example many | |
63e0c8b3 SP |
238 | organizations have a CVS repository which has only ever been accessed |
239 | by users who are located in the same location and timezone. In this | |
f842fdb0 | 240 | case a reasonable offset from UTC could be assumed. |
63e0c8b3 SP |
241 | + |
242 | Unlike the `rfc2822` format, this format is very strict. Any | |
882227f1 | 243 | variation in formatting will cause fast-import to reject the value. |
63e0c8b3 SP |
244 | |
245 | `rfc2822`:: | |
246 | This is the standard email format as described by RFC 2822. | |
247 | + | |
248 | An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git | |
f842fdb0 | 249 | parser is accurate, but a little on the lenient side. It is the |
0b444cdb | 250 | same parser used by 'git am' when applying patches |
63e0c8b3 SP |
251 | received from email. |
252 | + | |
253 | Some malformed strings may be accepted as valid dates. In some of | |
254 | these cases Git will still be able to obtain the correct date from | |
255 | the malformed string. There are also some types of malformed | |
256 | strings which Git will parse wrong, and yet consider valid. | |
257 | Seriously malformed strings will be rejected. | |
258 | + | |
9b92c82f SP |
259 | Unlike the `raw` format above, the timezone/UTC offset information |
260 | contained in an RFC 2822 date string is used to adjust the date | |
261 | value to UTC prior to storage. Therefore it is important that | |
262 | this information be as accurate as possible. | |
263 | + | |
f842fdb0 | 264 | If the source material uses RFC 2822 style dates, |
882227f1 | 265 | the frontend should let fast-import handle the parsing and conversion |
63e0c8b3 SP |
266 | (rather than attempting to do it itself) as the Git parser has |
267 | been well tested in the wild. | |
268 | + | |
269 | Frontends should prefer the `raw` format if the source material | |
f842fdb0 | 270 | already uses UNIX-epoch format, can be coaxed to give dates in that |
02783075 | 271 | format, or its format is easily convertible to it, as there is no |
f842fdb0 | 272 | ambiguity in parsing. |
63e0c8b3 SP |
273 | |
274 | `now`:: | |
275 | Always use the current time and timezone. The literal | |
276 | `now` must always be supplied for `<when>`. | |
277 | + | |
278 | This is a toy format. The current time and timezone of this system | |
279 | is always copied into the identity string at the time it is being | |
882227f1 | 280 | created by fast-import. There is no way to specify a different time or |
63e0c8b3 SP |
281 | timezone. |
282 | + | |
6a5d0b0a | 283 | This particular format is supplied as it's short to implement and |
63e0c8b3 SP |
284 | may be useful to a process that wants to create a new commit |
285 | right now, without needing to use a working directory or | |
0b444cdb | 286 | 'git update-index'. |
63e0c8b3 SP |
287 | + |
288 | If separate `author` and `committer` commands are used in a `commit` | |
289 | the timestamps may not match, as the system clock will be polled | |
290 | twice (once for each command). The only way to ensure that both | |
291 | author and committer identity information has the same timestamp | |
292 | is to omit `author` (thus copying from `committer`) or to use a | |
293 | date format other than `now`. | |
294 | ||
6e411d20 SP |
295 | Commands |
296 | ~~~~~~~~ | |
882227f1 | 297 | fast-import accepts several commands to update the current repository |
6e411d20 SP |
298 | and control the current import process. More detailed discussion |
299 | (with examples) of each command follows later. | |
300 | ||
301 | `commit`:: | |
302 | Creates a new branch or updates an existing branch by | |
303 | creating a new commit and updating the branch to point at | |
304 | the newly created commit. | |
305 | ||
306 | `tag`:: | |
307 | Creates an annotated tag object from an existing commit or | |
308 | branch. Lightweight tags are not supported by this command, | |
309 | as they are not recommended for recording meaningful points | |
310 | in time. | |
311 | ||
312 | `reset`:: | |
313 | Reset an existing branch (or a new branch) to a specific | |
314 | revision. This command must be used to change a branch to | |
315 | a specific revision without making a commit on it. | |
316 | ||
317 | `blob`:: | |
318 | Convert raw file data into a blob, for future use in a | |
319 | `commit` command. This command is optional and is not | |
320 | needed to perform an import. | |
321 | ||
322 | `checkpoint`:: | |
882227f1 | 323 | Forces fast-import to close the current packfile, generate its |
6e411d20 SP |
324 | unique SHA-1 checksum and index, and start a new packfile. |
325 | This command is optional and is not needed to perform | |
326 | an import. | |
327 | ||
ac053c02 SP |
328 | `progress`:: |
329 | Causes fast-import to echo the entire line to its own | |
330 | standard output. This command is optional and is not needed | |
331 | to perform an import. | |
332 | ||
85c62395 DB |
333 | `cat-blob`:: |
334 | Causes fast-import to print a blob in 'cat-file --batch' | |
335 | format to the file descriptor set with `--cat-blob-fd` or | |
336 | `stdout` if unspecified. | |
337 | ||
8dc6a373 DB |
338 | `ls`:: |
339 | Causes fast-import to print a line describing a directory | |
340 | entry in 'ls-tree' format to the file descriptor set with | |
341 | `--cat-blob-fd` or `stdout` if unspecified. | |
342 | ||
f963bd5d SR |
343 | `feature`:: |
344 | Require that fast-import supports the specified feature, or | |
345 | abort if it does not. | |
346 | ||
9c8398f0 SR |
347 | `option`:: |
348 | Specify any of the options listed under OPTIONS that do not | |
349 | change stream semantic to suit the frontend's needs. This | |
350 | command is optional and is not needed to perform an import. | |
351 | ||
6e411d20 SP |
352 | `commit` |
353 | ~~~~~~~~ | |
354 | Create or update a branch with a new commit, recording one logical | |
355 | change to the project. | |
356 | ||
357 | .... | |
358 | 'commit' SP <ref> LF | |
359 | mark? | |
74fbd118 SP |
360 | ('author' (SP <name>)? SP LT <email> GT SP <when> LF)? |
361 | 'committer' (SP <name>)? SP LT <email> GT SP <when> LF | |
6e411d20 SP |
362 | data |
363 | ('from' SP <committish> LF)? | |
364 | ('merge' SP <committish> LF)? | |
a8dd2e7d | 365 | (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* |
1fdb649c | 366 | LF? |
6e411d20 SP |
367 | .... |
368 | ||
369 | where `<ref>` is the name of the branch to make the commit on. | |
370 | Typically branch names are prefixed with `refs/heads/` in | |
371 | Git, so importing the CVS branch symbol `RELENG-1_0` would use | |
372 | `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of | |
373 | `<ref>` must be a valid refname in Git. As `LF` is not valid in | |
374 | a Git refname, no quoting or escaping syntax is supported here. | |
375 | ||
882227f1 | 376 | A `mark` command may optionally appear, requesting fast-import to save a |
6e411d20 SP |
377 | reference to the newly created commit for future use by the frontend |
378 | (see below for format). It is very common for frontends to mark | |
379 | every commit they create, thereby allowing future branch creation | |
380 | from any imported commit. | |
381 | ||
382 | The `data` command following `committer` must supply the commit | |
383 | message (see below for `data` command syntax). To import an empty | |
384 | commit message use a 0 length data. Commit messages are free-form | |
385 | and are not interpreted by Git. Currently they must be encoded in | |
882227f1 | 386 | UTF-8, as fast-import does not permit other encodings to be specified. |
6e411d20 | 387 | |
a8dd2e7d JH |
388 | Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, |
389 | `filedeleteall` and `notemodify` commands | |
825769a8 SP |
390 | may be included to update the contents of the branch prior to |
391 | creating the commit. These commands may be supplied in any order. | |
02783075 | 392 | However it is recommended that a `filedeleteall` command precede |
a8dd2e7d JH |
393 | all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in |
394 | the same commit, as `filedeleteall` wipes the branch clean (see below). | |
6e411d20 | 395 | |
1fdb649c SP |
396 | The `LF` after the command is optional (it used to be required). |
397 | ||
6e411d20 SP |
398 | `author` |
399 | ^^^^^^^^ | |
400 | An `author` command may optionally appear, if the author information | |
401 | might differ from the committer information. If `author` is omitted | |
882227f1 | 402 | then fast-import will automatically use the committer's information for |
6e411d20 SP |
403 | the author portion of the commit. See below for a description of |
404 | the fields in `author`, as they are identical to `committer`. | |
405 | ||
406 | `committer` | |
407 | ^^^^^^^^^^^ | |
408 | The `committer` command indicates who made this commit, and when | |
409 | they made it. | |
410 | ||
411 | Here `<name>` is the person's display name (for example | |
412 | ``Com M Itter'') and `<email>` is the person's email address | |
413 | (``cm@example.com''). `LT` and `GT` are the literal less-than (\x3c) | |
414 | and greater-than (\x3e) symbols. These are required to delimit | |
415 | the email address from the other fields in the line. Note that | |
416 | `<name>` is free-form and may contain any sequence of bytes, except | |
417 | `LT` and `LF`. It is typically UTF-8 encoded. | |
418 | ||
63e0c8b3 | 419 | The time of the change is specified by `<when>` using the date format |
c499d768 | 420 | that was selected by the \--date-format=<fmt> command line option. |
63e0c8b3 SP |
421 | See ``Date Formats'' above for the set of supported formats, and |
422 | their syntax. | |
6e411d20 SP |
423 | |
424 | `from` | |
425 | ^^^^^^ | |
ea5e370a SP |
426 | The `from` command is used to specify the commit to initialize |
427 | this branch from. This revision will be the first ancestor of the | |
428 | new commit. | |
429 | ||
430 | Omitting the `from` command in the first commit of a new branch | |
431 | will cause fast-import to create that commit with no ancestor. This | |
432 | tends to be desired only for the initial commit of a project. | |
9b33fa08 EB |
433 | If the frontend creates all files from scratch when making a new |
434 | branch, a `merge` command may be used instead of `from` to start | |
435 | the commit with an empty tree. | |
ea5e370a SP |
436 | Omitting the `from` command on existing branches is usually desired, |
437 | as the current commit on that branch is automatically assumed to | |
438 | be the first ancestor of the new commit. | |
6e411d20 SP |
439 | |
440 | As `LF` is not valid in a Git refname or SHA-1 expression, no | |
441 | quoting or escaping syntax is supported within `<committish>`. | |
442 | ||
443 | Here `<committish>` is any of the following: | |
444 | ||
882227f1 | 445 | * The name of an existing branch already in fast-import's internal branch |
6a5d0b0a | 446 | table. If fast-import doesn't know the name, it's treated as a SHA-1 |
6e411d20 SP |
447 | expression. |
448 | ||
449 | * A mark reference, `:<idnum>`, where `<idnum>` is the mark number. | |
450 | + | |
882227f1 | 451 | The reason fast-import uses `:` to denote a mark reference is this character |
6e411d20 | 452 | is not legal in a Git branch name. The leading `:` makes it easy |
02783075 | 453 | to distinguish between the mark 42 (`:42`) and the branch 42 (`42` |
6e411d20 SP |
454 | or `refs/heads/42`), or an abbreviated SHA-1 which happened to |
455 | consist only of base-10 digits. | |
456 | + | |
457 | Marks must be declared (via `mark`) before they can be used. | |
458 | ||
459 | * A complete 40 byte or abbreviated commit SHA-1 in hex. | |
460 | ||
461 | * Any valid Git SHA-1 expression that resolves to a commit. See | |
9d83e382 | 462 | ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details. |
6e411d20 SP |
463 | |
464 | The special case of restarting an incremental import from the | |
465 | current branch value should be written as: | |
466 | ---- | |
467 | from refs/heads/branch^0 | |
468 | ---- | |
882227f1 | 469 | The `{caret}0` suffix is necessary as fast-import does not permit a branch to |
6e411d20 | 470 | start from itself, and the branch is created in memory before the |
209f1298 | 471 | `from` command is even read from the input. Adding `{caret}0` will force |
882227f1 | 472 | fast-import to resolve the commit through Git's revision parsing library, |
6e411d20 SP |
473 | rather than its internal branch table, thereby loading in the |
474 | existing value of the branch. | |
475 | ||
476 | `merge` | |
477 | ^^^^^^^ | |
9b33fa08 EB |
478 | Includes one additional ancestor commit. If the `from` command is |
479 | omitted when creating a new branch, the first `merge` commit will be | |
480 | the first ancestor of the current commit, and the branch will start | |
481 | out with no files. An unlimited number of `merge` commands per | |
882227f1 | 482 | commit are permitted by fast-import, thereby establishing an n-way merge. |
6e411d20 SP |
483 | However Git's other tools never create commits with more than 15 |
484 | additional ancestors (forming a 16-way merge). For this reason | |
485 | it is suggested that frontends do not use more than 15 `merge` | |
9b33fa08 | 486 | commands per commit; 16, if starting a new, empty branch. |
6e411d20 SP |
487 | |
488 | Here `<committish>` is any of the commit specification expressions | |
489 | also accepted by `from` (see above). | |
490 | ||
491 | `filemodify` | |
ef94edb5 | 492 | ^^^^^^^^^^^^ |
6e411d20 SP |
493 | Included in a `commit` command to add a new file or change the |
494 | content of an existing file. This command has two different means | |
495 | of specifying the content of the file. | |
496 | ||
497 | External data format:: | |
498 | The data content for the file was already supplied by a prior | |
499 | `blob` command. The frontend just needs to connect it. | |
500 | + | |
501 | .... | |
502 | 'M' SP <mode> SP <dataref> SP <path> LF | |
503 | .... | |
504 | + | |
334fba65 | 505 | Here usually `<dataref>` must be either a mark reference (`:<idnum>`) |
6e411d20 | 506 | set by a prior `blob` command, or a full 40-byte SHA-1 of an |
334fba65 JN |
507 | existing Git blob object. If `<mode>` is `040000`` then |
508 | `<dataref>` must be the full 40-byte SHA-1 of an existing | |
509 | Git tree object or a mark reference set with `--import-marks`. | |
6e411d20 SP |
510 | |
511 | Inline data format:: | |
512 | The data content for the file has not been supplied yet. | |
513 | The frontend wants to supply it as part of this modify | |
514 | command. | |
515 | + | |
516 | .... | |
517 | 'M' SP <mode> SP 'inline' SP <path> LF | |
518 | data | |
519 | .... | |
520 | + | |
521 | See below for a detailed description of the `data` command. | |
522 | ||
523 | In both formats `<mode>` is the type of file entry, specified | |
524 | in octal. Git only supports the following modes: | |
525 | ||
526 | * `100644` or `644`: A normal (not-executable) file. The majority | |
527 | of files in most projects use this mode. If in doubt, this is | |
528 | what you want. | |
529 | * `100755` or `755`: A normal, but executable, file. | |
9981b6d9 | 530 | * `120000`: A symlink, the content of the file will be the link target. |
03db4525 AG |
531 | * `160000`: A gitlink, SHA-1 of the object refers to a commit in |
532 | another repository. Git links can only be specified by SHA or through | |
533 | a commit mark. They are used to implement submodules. | |
334fba65 JN |
534 | * `040000`: A subdirectory. Subdirectories can only be specified by |
535 | SHA or through a tree mark set with `--import-marks`. | |
6e411d20 SP |
536 | |
537 | In both formats `<path>` is the complete path of the file to be added | |
538 | (if not already existing) or modified (if already existing). | |
539 | ||
c4431d38 | 540 | A `<path>` string must use UNIX-style directory separators (forward |
6e411d20 SP |
541 | slash `/`), may contain any byte other than `LF`, and must not |
542 | start with double quote (`"`). | |
543 | ||
544 | If an `LF` or double quote must be encoded into `<path>` shell-style | |
545 | quoting should be used, e.g. `"path/with\n and \" in it"`. | |
546 | ||
02783075 | 547 | The value of `<path>` must be in canonical form. That is it must not: |
6e411d20 SP |
548 | |
549 | * contain an empty directory component (e.g. `foo//bar` is invalid), | |
c4431d38 JK |
550 | * end with a directory separator (e.g. `foo/` is invalid), |
551 | * start with a directory separator (e.g. `/foo` is invalid), | |
6e411d20 SP |
552 | * contain the special component `.` or `..` (e.g. `foo/./bar` and |
553 | `foo/../bar` are invalid). | |
554 | ||
e5959106 JN |
555 | The root of the tree can be represented by an empty string as `<path>`. |
556 | ||
6e411d20 SP |
557 | It is recommended that `<path>` always be encoded using UTF-8. |
558 | ||
6e411d20 | 559 | `filedelete` |
ef94edb5 | 560 | ^^^^^^^^^^^^ |
512e44b2 SP |
561 | Included in a `commit` command to remove a file or recursively |
562 | delete an entire directory from the branch. If the file or directory | |
563 | removal makes its parent directory empty, the parent directory will | |
6e411d20 SP |
564 | be automatically removed too. This cascades up the tree until the |
565 | first non-empty directory or the root is reached. | |
566 | ||
567 | .... | |
568 | 'D' SP <path> LF | |
569 | .... | |
570 | ||
512e44b2 SP |
571 | here `<path>` is the complete path of the file or subdirectory to |
572 | be removed from the branch. | |
6e411d20 SP |
573 | See `filemodify` above for a detailed description of `<path>`. |
574 | ||
b6f3481b SP |
575 | `filecopy` |
576 | ^^^^^^^^^^^^ | |
577 | Recursively copies an existing file or subdirectory to a different | |
578 | location within the branch. The existing file or directory must | |
579 | exist. If the destination exists it will be completely replaced | |
580 | by the content copied from the source. | |
581 | ||
582 | .... | |
583 | 'C' SP <path> SP <path> LF | |
584 | .... | |
585 | ||
586 | here the first `<path>` is the source location and the second | |
587 | `<path>` is the destination. See `filemodify` above for a detailed | |
588 | description of what `<path>` may look like. To use a source path | |
589 | that contains SP the path must be quoted. | |
590 | ||
591 | A `filecopy` command takes effect immediately. Once the source | |
592 | location has been copied to the destination any future commands | |
593 | applied to the source location will not impact the destination of | |
594 | the copy. | |
595 | ||
f39a946a SP |
596 | `filerename` |
597 | ^^^^^^^^^^^^ | |
598 | Renames an existing file or subdirectory to a different location | |
599 | within the branch. The existing file or directory must exist. If | |
600 | the destination exists it will be replaced by the source directory. | |
601 | ||
602 | .... | |
603 | 'R' SP <path> SP <path> LF | |
604 | .... | |
605 | ||
606 | here the first `<path>` is the source location and the second | |
607 | `<path>` is the destination. See `filemodify` above for a detailed | |
608 | description of what `<path>` may look like. To use a source path | |
609 | that contains SP the path must be quoted. | |
610 | ||
611 | A `filerename` command takes effect immediately. Once the source | |
612 | location has been renamed to the destination any future commands | |
613 | applied to the source location will create new files there and not | |
614 | impact the destination of the rename. | |
615 | ||
b6f3481b SP |
616 | Note that a `filerename` is the same as a `filecopy` followed by a |
617 | `filedelete` of the source location. There is a slight performance | |
618 | advantage to using `filerename`, but the advantage is so small | |
619 | that it is never worth trying to convert a delete/add pair in | |
620 | source material into a rename for fast-import. This `filerename` | |
621 | command is provided just to simplify frontends that already have | |
622 | rename information and don't want bother with decomposing it into a | |
623 | `filecopy` followed by a `filedelete`. | |
624 | ||
825769a8 SP |
625 | `filedeleteall` |
626 | ^^^^^^^^^^^^^^^ | |
627 | Included in a `commit` command to remove all files (and also all | |
628 | directories) from the branch. This command resets the internal | |
629 | branch structure to have no files in it, allowing the frontend | |
630 | to subsequently add all interesting files from scratch. | |
631 | ||
632 | .... | |
633 | 'deleteall' LF | |
634 | .... | |
635 | ||
636 | This command is extremely useful if the frontend does not know | |
637 | (or does not care to know) what files are currently on the branch, | |
638 | and therefore cannot generate the proper `filedelete` commands to | |
639 | update the content. | |
640 | ||
641 | Issuing a `filedeleteall` followed by the needed `filemodify` | |
642 | commands to set the correct content will produce the same results | |
643 | as sending only the needed `filemodify` and `filedelete` commands. | |
882227f1 | 644 | The `filedeleteall` approach may however require fast-import to use slightly |
825769a8 SP |
645 | more memory per active branch (less than 1 MiB for even most large |
646 | projects); so frontends that can easily obtain only the affected | |
647 | paths for a commit are encouraged to do so. | |
648 | ||
a8dd2e7d JH |
649 | `notemodify` |
650 | ^^^^^^^^^^^^ | |
b421812b DI |
651 | Included in a `commit` `<notes_ref>` command to add a new note |
652 | annotating a `<committish>` or change this annotation contents. | |
653 | Internally it is similar to filemodify 100644 on `<committish>` | |
654 | path (maybe split into subdirectories). It's not advised to | |
655 | use any other commands to write to the `<notes_ref>` tree except | |
656 | `filedeleteall` to delete all existing notes in this tree. | |
657 | This command has two different means of specifying the content | |
658 | of the note. | |
a8dd2e7d JH |
659 | |
660 | External data format:: | |
661 | The data content for the note was already supplied by a prior | |
662 | `blob` command. The frontend just needs to connect it to the | |
663 | commit that is to be annotated. | |
664 | + | |
665 | .... | |
666 | 'N' SP <dataref> SP <committish> LF | |
667 | .... | |
668 | + | |
669 | Here `<dataref>` can be either a mark reference (`:<idnum>`) | |
670 | set by a prior `blob` command, or a full 40-byte SHA-1 of an | |
671 | existing Git blob object. | |
672 | ||
673 | Inline data format:: | |
674 | The data content for the note has not been supplied yet. | |
675 | The frontend wants to supply it as part of this modify | |
676 | command. | |
677 | + | |
678 | .... | |
679 | 'N' SP 'inline' SP <committish> LF | |
680 | data | |
681 | .... | |
682 | + | |
683 | See below for a detailed description of the `data` command. | |
684 | ||
685 | In both formats `<committish>` is any of the commit specification | |
686 | expressions also accepted by `from` (see above). | |
687 | ||
6e411d20 SP |
688 | `mark` |
689 | ~~~~~~ | |
882227f1 | 690 | Arranges for fast-import to save a reference to the current object, allowing |
6e411d20 SP |
691 | the frontend to recall this object at a future point in time, without |
692 | knowing its SHA-1. Here the current object is the object creation | |
693 | command the `mark` command appears within. This can be `commit`, | |
694 | `tag`, and `blob`, but `commit` is the most common usage. | |
695 | ||
696 | .... | |
697 | 'mark' SP ':' <idnum> LF | |
698 | .... | |
699 | ||
700 | where `<idnum>` is the number assigned by the frontend to this mark. | |
ef94edb5 SP |
701 | The value of `<idnum>` is expressed as an ASCII decimal integer. |
702 | The value 0 is reserved and cannot be used as | |
6e411d20 SP |
703 | a mark. Only values greater than or equal to 1 may be used as marks. |
704 | ||
705 | New marks are created automatically. Existing marks can be moved | |
706 | to another object simply by reusing the same `<idnum>` in another | |
707 | `mark` command. | |
708 | ||
709 | `tag` | |
710 | ~~~~~ | |
711 | Creates an annotated tag referring to a specific commit. To create | |
712 | lightweight (non-annotated) tags see the `reset` command below. | |
713 | ||
714 | .... | |
715 | 'tag' SP <name> LF | |
716 | 'from' SP <committish> LF | |
74fbd118 | 717 | 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF |
6e411d20 | 718 | data |
6e411d20 SP |
719 | .... |
720 | ||
721 | where `<name>` is the name of the tag to create. | |
722 | ||
723 | Tag names are automatically prefixed with `refs/tags/` when stored | |
724 | in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would | |
882227f1 | 725 | use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the |
6e411d20 SP |
726 | corresponding ref as `refs/tags/RELENG-1_0-FINAL`. |
727 | ||
728 | The value of `<name>` must be a valid refname in Git and therefore | |
729 | may contain forward slashes. As `LF` is not valid in a Git refname, | |
730 | no quoting or escaping syntax is supported here. | |
731 | ||
732 | The `from` command is the same as in the `commit` command; see | |
733 | above for details. | |
734 | ||
735 | The `tagger` command uses the same format as `committer` within | |
736 | `commit`; again see above for details. | |
737 | ||
738 | The `data` command following `tagger` must supply the annotated tag | |
739 | message (see below for `data` command syntax). To import an empty | |
740 | tag message use a 0 length data. Tag messages are free-form and are | |
741 | not interpreted by Git. Currently they must be encoded in UTF-8, | |
882227f1 | 742 | as fast-import does not permit other encodings to be specified. |
6e411d20 | 743 | |
882227f1 | 744 | Signing annotated tags during import from within fast-import is not |
6e411d20 SP |
745 | supported. Trying to include your own PGP/GPG signature is not |
746 | recommended, as the frontend does not (easily) have access to the | |
747 | complete set of bytes which normally goes into such a signature. | |
882227f1 | 748 | If signing is required, create lightweight tags from within fast-import with |
6e411d20 | 749 | `reset`, then create the annotated versions of those tags offline |
0b444cdb | 750 | with the standard 'git tag' process. |
6e411d20 SP |
751 | |
752 | `reset` | |
753 | ~~~~~~~ | |
754 | Creates (or recreates) the named branch, optionally starting from | |
755 | a specific revision. The reset command allows a frontend to issue | |
756 | a new `from` command for an existing branch, or to create a new | |
757 | branch from an existing commit without creating a new commit. | |
758 | ||
759 | .... | |
760 | 'reset' SP <ref> LF | |
761 | ('from' SP <committish> LF)? | |
1fdb649c | 762 | LF? |
6e411d20 SP |
763 | .... |
764 | ||
765 | For a detailed description of `<ref>` and `<committish>` see above | |
766 | under `commit` and `from`. | |
767 | ||
1fdb649c SP |
768 | The `LF` after the command is optional (it used to be required). |
769 | ||
6e411d20 SP |
770 | The `reset` command can also be used to create lightweight |
771 | (non-annotated) tags. For example: | |
772 | ||
773 | ==== | |
774 | reset refs/tags/938 | |
775 | from :938 | |
776 | ==== | |
777 | ||
778 | would create the lightweight tag `refs/tags/938` referring to | |
779 | whatever commit mark `:938` references. | |
780 | ||
781 | `blob` | |
782 | ~~~~~~ | |
783 | Requests writing one file revision to the packfile. The revision | |
784 | is not connected to any commit; this connection must be formed in | |
785 | a subsequent `commit` command by referencing the blob through an | |
786 | assigned mark. | |
787 | ||
788 | .... | |
789 | 'blob' LF | |
790 | mark? | |
791 | data | |
792 | .... | |
793 | ||
794 | The mark command is optional here as some frontends have chosen | |
795 | to generate the Git SHA-1 for the blob on their own, and feed that | |
6a5d0b0a | 796 | directly to `commit`. This is typically more work than it's worth |
6e411d20 SP |
797 | however, as marks are inexpensive to store and easy to use. |
798 | ||
799 | `data` | |
800 | ~~~~~~ | |
801 | Supplies raw data (for use as blob/file content, commit messages, or | |
882227f1 | 802 | annotated tag messages) to fast-import. Data can be supplied using an exact |
6e411d20 SP |
803 | byte count or delimited with a terminating line. Real frontends |
804 | intended for production-quality conversions should always use the | |
805 | exact byte count format, as it is more robust and performs better. | |
882227f1 | 806 | The delimited format is intended primarily for testing fast-import. |
6e411d20 | 807 | |
401d53fa SP |
808 | Comment lines appearing within the `<raw>` part of `data` commands |
809 | are always taken to be part of the body of the data and are therefore | |
810 | never ignored by fast-import. This makes it safe to import any | |
811 | file/message content whose lines might start with `#`. | |
812 | ||
ef94edb5 SP |
813 | Exact byte count format:: |
814 | The frontend must specify the number of bytes of data. | |
815 | + | |
6e411d20 SP |
816 | .... |
817 | 'data' SP <count> LF | |
2c570cde | 818 | <raw> LF? |
6e411d20 | 819 | .... |
ef94edb5 | 820 | + |
6e411d20 | 821 | where `<count>` is the exact number of bytes appearing within |
ef94edb5 SP |
822 | `<raw>`. The value of `<count>` is expressed as an ASCII decimal |
823 | integer. The `LF` on either side of `<raw>` is not | |
6e411d20 | 824 | included in `<count>` and will not be included in the imported data. |
2c570cde SP |
825 | + |
826 | The `LF` after `<raw>` is optional (it used to be required) but | |
827 | recommended. Always including it makes debugging a fast-import | |
828 | stream easier as the next command always starts in column 0 | |
829 | of the next line, even if `<raw>` did not end with an `LF`. | |
6e411d20 | 830 | |
ef94edb5 SP |
831 | Delimited format:: |
832 | A delimiter string is used to mark the end of the data. | |
882227f1 | 833 | fast-import will compute the length by searching for the delimiter. |
02783075 | 834 | This format is primarily useful for testing and is not |
ef94edb5 SP |
835 | recommended for real data. |
836 | + | |
6e411d20 SP |
837 | .... |
838 | 'data' SP '<<' <delim> LF | |
839 | <raw> LF | |
840 | <delim> LF | |
2c570cde | 841 | LF? |
6e411d20 | 842 | .... |
ef94edb5 | 843 | + |
6e411d20 SP |
844 | where `<delim>` is the chosen delimiter string. The string `<delim>` |
845 | must not appear on a line by itself within `<raw>`, as otherwise | |
882227f1 | 846 | fast-import will think the data ends earlier than it really does. The `LF` |
6e411d20 SP |
847 | immediately trailing `<raw>` is part of `<raw>`. This is one of |
848 | the limitations of the delimited format, it is impossible to supply | |
849 | a data chunk which does not have an LF as its last byte. | |
2c570cde SP |
850 | + |
851 | The `LF` after `<delim> LF` is optional (it used to be required). | |
6e411d20 SP |
852 | |
853 | `checkpoint` | |
854 | ~~~~~~~~~~~~ | |
882227f1 | 855 | Forces fast-import to close the current packfile, start a new one, and to |
820b9310 | 856 | save out all current branch refs, tags and marks. |
6e411d20 SP |
857 | |
858 | .... | |
859 | 'checkpoint' LF | |
1fdb649c | 860 | LF? |
6e411d20 SP |
861 | .... |
862 | ||
882227f1 | 863 | Note that fast-import automatically switches packfiles when the current |
820b9310 | 864 | packfile reaches \--max-pack-size, or 4 GiB, whichever limit is |
882227f1 | 865 | smaller. During an automatic packfile switch fast-import does not update |
820b9310 SP |
866 | the branch refs, tags or marks. |
867 | ||
868 | As a `checkpoint` can require a significant amount of CPU time and | |
869 | disk IO (to compute the overall pack SHA-1 checksum, generate the | |
870 | corresponding index file, and update the refs) it can easily take | |
871 | several minutes for a single `checkpoint` command to complete. | |
872 | ||
873 | Frontends may choose to issue checkpoints during extremely large | |
874 | and long running imports, or when they need to allow another Git | |
875 | process access to a branch. However given that a 30 GiB Subversion | |
882227f1 | 876 | repository can be loaded into Git through fast-import in about 3 hours, |
820b9310 SP |
877 | explicit checkpointing may not be necessary. |
878 | ||
1fdb649c | 879 | The `LF` after the command is optional (it used to be required). |
820b9310 | 880 | |
ac053c02 SP |
881 | `progress` |
882 | ~~~~~~~~~~ | |
883 | Causes fast-import to print the entire `progress` line unmodified to | |
884 | its standard output channel (file descriptor 1) when the command is | |
885 | processed from the input stream. The command otherwise has no impact | |
886 | on the current import, or on any of fast-import's internal state. | |
887 | ||
888 | .... | |
889 | 'progress' SP <any> LF | |
890 | LF? | |
891 | .... | |
892 | ||
893 | The `<any>` part of the command may contain any sequence of bytes | |
894 | that does not contain `LF`. The `LF` after the command is optional. | |
895 | Callers may wish to process the output through a tool such as sed to | |
896 | remove the leading part of the line, for example: | |
897 | ||
898 | ==== | |
b1889c36 | 899 | frontend | git fast-import | sed 's/^progress //' |
ac053c02 SP |
900 | ==== |
901 | ||
902 | Placing a `progress` command immediately after a `checkpoint` will | |
903 | inform the reader when the `checkpoint` has been completed and it | |
904 | can safely access the refs that fast-import updated. | |
905 | ||
85c62395 DB |
906 | `cat-blob` |
907 | ~~~~~~~~~~ | |
908 | Causes fast-import to print a blob to a file descriptor previously | |
909 | arranged with the `--cat-blob-fd` argument. The command otherwise | |
910 | has no impact on the current import; its main purpose is to | |
911 | retrieve blobs that may be in fast-import's memory but not | |
912 | accessible from the target repository. | |
913 | ||
914 | .... | |
915 | 'cat-blob' SP <dataref> LF | |
916 | .... | |
917 | ||
918 | The `<dataref>` can be either a mark reference (`:<idnum>`) | |
919 | set previously or a full 40-byte SHA-1 of a Git blob, preexisting or | |
920 | ready to be written. | |
921 | ||
898243b8 | 922 | Output uses the same format as `git cat-file --batch`: |
85c62395 DB |
923 | |
924 | ==== | |
925 | <sha1> SP 'blob' SP <size> LF | |
926 | <contents> LF | |
927 | ==== | |
928 | ||
777f80d7 JN |
929 | This command can be used anywhere in the stream that comments are |
930 | accepted. In particular, the `cat-blob` command can be used in the | |
931 | middle of a commit but not in the middle of a `data` command. | |
932 | ||
8dc6a373 DB |
933 | `ls` |
934 | ~~~~ | |
935 | Prints information about the object at a path to a file descriptor | |
936 | previously arranged with the `--cat-blob-fd` argument. This allows | |
937 | printing a blob from the active commit (with `cat-blob`) or copying a | |
938 | blob or tree from a previous commit for use in the current one (with | |
939 | `filemodify`). | |
940 | ||
941 | The `ls` command can be used anywhere in the stream that comments are | |
942 | accepted, including the middle of a commit. | |
943 | ||
944 | Reading from the active commit:: | |
945 | This form can only be used in the middle of a `commit`. | |
946 | The path names a directory entry within fast-import's | |
947 | active commit. The path must be quoted in this case. | |
948 | + | |
949 | .... | |
950 | 'ls' SP <path> LF | |
951 | .... | |
952 | ||
953 | Reading from a named tree:: | |
954 | The `<dataref>` can be a mark reference (`:<idnum>`) or the | |
955 | full 40-byte SHA-1 of a Git tag, commit, or tree object, | |
956 | preexisting or waiting to be written. | |
957 | The path is relative to the top level of the tree | |
958 | named by `<dataref>`. | |
959 | + | |
960 | .... | |
961 | 'ls' SP <dataref> SP <path> LF | |
962 | .... | |
963 | ||
964 | See `filemodify` above for a detailed description of `<path>`. | |
965 | ||
966 | Output uses the same format as `git ls-tree <tree> {litdd} <path>`: | |
967 | ||
968 | ==== | |
969 | <mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF | |
970 | ==== | |
971 | ||
972 | The <dataref> represents the blob, tree, or commit object at <path> | |
973 | and can be used in later 'cat-blob', 'filemodify', or 'ls' commands. | |
974 | ||
975 | If there is no file or subtree at that path, 'git fast-import' will | |
976 | instead report | |
977 | ||
978 | ==== | |
979 | missing SP <path> LF | |
980 | ==== | |
981 | ||
f963bd5d SR |
982 | `feature` |
983 | ~~~~~~~~~ | |
984 | Require that fast-import supports the specified feature, or abort if | |
985 | it does not. | |
986 | ||
987 | .... | |
4980fffb | 988 | 'feature' SP <feature> ('=' <argument>)? LF |
f963bd5d SR |
989 | .... |
990 | ||
4980fffb | 991 | The <feature> part of the command may be any one of the following: |
f963bd5d | 992 | |
4980fffb JN |
993 | date-format:: |
994 | export-marks:: | |
995 | relative-marks:: | |
996 | no-relative-marks:: | |
997 | force:: | |
998 | Act as though the corresponding command-line option with | |
999 | a leading '--' was passed on the command line | |
1000 | (see OPTIONS, above). | |
f963bd5d | 1001 | |
4980fffb JN |
1002 | import-marks:: |
1003 | Like --import-marks except in two respects: first, only one | |
1004 | "feature import-marks" command is allowed per stream; | |
1005 | second, an --import-marks= command-line option overrides | |
1006 | any "feature import-marks" command in the stream. | |
f963bd5d | 1007 | |
85c62395 | 1008 | cat-blob:: |
8dc6a373 DB |
1009 | ls:: |
1010 | Require that the backend support the 'cat-blob' or 'ls' command. | |
1011 | Versions of fast-import not supporting the specified command | |
1012 | will exit with a message indicating so. | |
85c62395 DB |
1013 | This lets the import error out early with a clear message, |
1014 | rather than wasting time on the early part of an import | |
1015 | before the unsupported command is detected. | |
081751c8 | 1016 | |
547e8b92 JN |
1017 | notes:: |
1018 | Require that the backend support the 'notemodify' (N) | |
1019 | subcommand to the 'commit' command. | |
1020 | Versions of fast-import not supporting notes will exit | |
1021 | with a message indicating so. | |
1022 | ||
a8e4a594 | 1023 | |
9c8398f0 SR |
1024 | `option` |
1025 | ~~~~~~~~ | |
1026 | Processes the specified option so that git fast-import behaves in a | |
1027 | way that suits the frontend's needs. | |
1028 | Note that options specified by the frontend are overridden by any | |
1029 | options the user may specify to git fast-import itself. | |
1030 | ||
1031 | .... | |
1032 | 'option' SP <option> LF | |
1033 | .... | |
1034 | ||
1035 | The `<option>` part of the command may contain any of the options | |
1036 | listed in the OPTIONS section that do not change import semantics, | |
1037 | without the leading '--' and is treated in the same way. | |
1038 | ||
1039 | Option commands must be the first commands on the input (not counting | |
1040 | feature commands), to give an option command after any non-option | |
1041 | command is an error. | |
1042 | ||
1043 | The following commandline options change import semantics and may therefore | |
1044 | not be passed as option: | |
1045 | ||
1046 | * date-format | |
1047 | * import-marks | |
1048 | * export-marks | |
85c62395 | 1049 | * cat-blob-fd |
9c8398f0 SR |
1050 | * force |
1051 | ||
e7e5170f SP |
1052 | Crash Reports |
1053 | ------------- | |
1054 | If fast-import is supplied invalid input it will terminate with a | |
1055 | non-zero exit status and create a crash report in the top level of | |
1056 | the Git repository it was importing into. Crash reports contain | |
1057 | a snapshot of the internal fast-import state as well as the most | |
1058 | recent commands that lead up to the crash. | |
1059 | ||
1060 | All recent commands (including stream comments, file changes and | |
1061 | progress commands) are shown in the command history within the crash | |
1062 | report, but raw file data and commit messages are excluded from the | |
1063 | crash report. This exclusion saves space within the report file | |
1064 | and reduces the amount of buffering that fast-import must perform | |
1065 | during execution. | |
1066 | ||
1067 | After writing a crash report fast-import will close the current | |
1068 | packfile and export the marks table. This allows the frontend | |
1069 | developer to inspect the repository state and resume the import from | |
1070 | the point where it crashed. The modified branches and tags are not | |
1071 | updated during a crash, as the import did not complete successfully. | |
1072 | Branch and tag information can be found in the crash report and | |
1073 | must be applied manually if the update is needed. | |
1074 | ||
1075 | An example crash: | |
1076 | ||
1077 | ==== | |
1078 | $ cat >in <<END_OF_INPUT | |
1079 | # my very first test commit | |
1080 | commit refs/heads/master | |
1081 | committer Shawn O. Pearce <spearce> 19283 -0400 | |
1082 | # who is that guy anyway? | |
1083 | data <<EOF | |
1084 | this is my commit | |
1085 | EOF | |
1086 | M 644 inline .gitignore | |
1087 | data <<EOF | |
1088 | .gitignore | |
1089 | EOF | |
1090 | M 777 inline bob | |
1091 | END_OF_INPUT | |
1092 | ||
b1889c36 | 1093 | $ git fast-import <in |
e7e5170f SP |
1094 | fatal: Corrupt mode: M 777 inline bob |
1095 | fast-import: dumping crash report to .git/fast_import_crash_8434 | |
1096 | ||
1097 | $ cat .git/fast_import_crash_8434 | |
1098 | fast-import crash report: | |
1099 | fast-import process: 8434 | |
1100 | parent process : 1391 | |
1101 | at Sat Sep 1 00:58:12 2007 | |
1102 | ||
1103 | fatal: Corrupt mode: M 777 inline bob | |
1104 | ||
1105 | Most Recent Commands Before Crash | |
1106 | --------------------------------- | |
1107 | # my very first test commit | |
1108 | commit refs/heads/master | |
1109 | committer Shawn O. Pearce <spearce> 19283 -0400 | |
1110 | # who is that guy anyway? | |
1111 | data <<EOF | |
1112 | M 644 inline .gitignore | |
1113 | data <<EOF | |
1114 | * M 777 inline bob | |
1115 | ||
1116 | Active Branch LRU | |
1117 | ----------------- | |
1118 | active_branches = 1 cur, 5 max | |
1119 | ||
1120 | pos clock name | |
1121 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
1122 | 1) 0 refs/heads/master | |
1123 | ||
1124 | Inactive Branches | |
1125 | ----------------- | |
1126 | refs/heads/master: | |
1127 | status : active loaded dirty | |
1128 | tip commit : 0000000000000000000000000000000000000000 | |
1129 | old tree : 0000000000000000000000000000000000000000 | |
1130 | cur tree : 0000000000000000000000000000000000000000 | |
1131 | commit clock: 0 | |
1132 | last pack : | |
1133 | ||
1134 | ||
1135 | ------------------- | |
1136 | END OF CRASH REPORT | |
1137 | ==== | |
1138 | ||
bdd9f424 SP |
1139 | Tips and Tricks |
1140 | --------------- | |
1141 | The following tips and tricks have been collected from various | |
882227f1 | 1142 | users of fast-import, and are offered here as suggestions. |
bdd9f424 SP |
1143 | |
1144 | Use One Mark Per Commit | |
1145 | ~~~~~~~~~~~~~~~~~~~~~~~ | |
1146 | When doing a repository conversion, use a unique mark per commit | |
1147 | (`mark :<n>`) and supply the \--export-marks option on the command | |
882227f1 | 1148 | line. fast-import will dump a file which lists every mark and the Git |
bdd9f424 SP |
1149 | object SHA-1 that corresponds to it. If the frontend can tie |
1150 | the marks back to the source repository, it is easy to verify the | |
1151 | accuracy and completeness of the import by comparing each Git | |
1152 | commit to the corresponding source revision. | |
1153 | ||
1154 | Coming from a system such as Perforce or Subversion this should be | |
882227f1 | 1155 | quite simple, as the fast-import mark can also be the Perforce changeset |
bdd9f424 SP |
1156 | number or the Subversion revision number. |
1157 | ||
1158 | Freely Skip Around Branches | |
1159 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
1160 | Don't bother trying to optimize the frontend to stick to one branch | |
1161 | at a time during an import. Although doing so might be slightly | |
882227f1 | 1162 | faster for fast-import, it tends to increase the complexity of the frontend |
bdd9f424 SP |
1163 | code considerably. |
1164 | ||
882227f1 | 1165 | The branch LRU builtin to fast-import tends to behave very well, and the |
bdd9f424 SP |
1166 | cost of activating an inactive branch is so low that bouncing around |
1167 | between branches has virtually no impact on import performance. | |
1168 | ||
c7346156 SP |
1169 | Handling Renames |
1170 | ~~~~~~~~~~~~~~~~ | |
1171 | When importing a renamed file or directory, simply delete the old | |
1172 | name(s) and modify the new name(s) during the corresponding commit. | |
1173 | Git performs rename detection after-the-fact, rather than explicitly | |
1174 | during a commit. | |
1175 | ||
bdd9f424 SP |
1176 | Use Tag Fixup Branches |
1177 | ~~~~~~~~~~~~~~~~~~~~~~ | |
1178 | Some other SCM systems let the user create a tag from multiple | |
1179 | files which are not from the same commit/changeset. Or to create | |
1180 | tags which are a subset of the files available in the repository. | |
1181 | ||
1182 | Importing these tags as-is in Git is impossible without making at | |
1183 | least one commit which ``fixes up'' the files to match the content | |
882227f1 | 1184 | of the tag. Use fast-import's `reset` command to reset a dummy branch |
bdd9f424 SP |
1185 | outside of your normal branch space to the base commit for the tag, |
1186 | then commit one or more file fixup commits, and finally tag the | |
1187 | dummy branch. | |
1188 | ||
1189 | For example since all normal branches are stored under `refs/heads/` | |
1190 | name the tag fixup branch `TAG_FIXUP`. This way it is impossible for | |
1191 | the fixup branch used by the importer to have namespace conflicts | |
1192 | with real branches imported from the source (the name `TAG_FIXUP` | |
1193 | is not `refs/heads/TAG_FIXUP`). | |
1194 | ||
1195 | When committing fixups, consider using `merge` to connect the | |
1196 | commit(s) which are supplying file revisions to the fixup branch. | |
0b444cdb | 1197 | Doing so will allow tools such as 'git blame' to track |
bdd9f424 SP |
1198 | through the real commit history and properly annotate the source |
1199 | files. | |
1200 | ||
882227f1 | 1201 | After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` |
bdd9f424 SP |
1202 | to remove the dummy branch. |
1203 | ||
1204 | Import Now, Repack Later | |
1205 | ~~~~~~~~~~~~~~~~~~~~~~~~ | |
882227f1 | 1206 | As soon as fast-import completes the Git repository is completely valid |
02783075 | 1207 | and ready for use. Typically this takes only a very short time, |
bdd9f424 SP |
1208 | even for considerably large projects (100,000+ commits). |
1209 | ||
1210 | However repacking the repository is necessary to improve data | |
1211 | locality and access performance. It can also take hours on extremely | |
1212 | large projects (especially if -f and a large \--window parameter is | |
1213 | used). Since repacking is safe to run alongside readers and writers, | |
1214 | run the repack in the background and let it finish when it finishes. | |
1215 | There is no reason to wait to explore your new Git project! | |
1216 | ||
1217 | If you choose to wait for the repack, don't try to run benchmarks | |
882227f1 | 1218 | or performance tests until repacking is completed. fast-import outputs |
bdd9f424 SP |
1219 | suboptimal packfiles that are simply never seen in real use |
1220 | situations. | |
1221 | ||
1222 | Repacking Historical Data | |
1223 | ~~~~~~~~~~~~~~~~~~~~~~~~~ | |
1224 | If you are repacking very old imported data (e.g. older than the | |
1225 | last year), consider expending some extra CPU time and supplying | |
0b444cdb | 1226 | \--window=50 (or higher) when you run 'git repack'. |
bdd9f424 SP |
1227 | This will take longer, but will also produce a smaller packfile. |
1228 | You only need to expend the effort once, and everyone using your | |
1229 | project will benefit from the smaller repository. | |
1230 | ||
ac053c02 SP |
1231 | Include Some Progress Messages |
1232 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | |
1233 | Every once in a while have your frontend emit a `progress` message | |
1234 | to fast-import. The contents of the messages are entirely free-form, | |
1235 | so one suggestion would be to output the current month and year | |
1236 | each time the current commit date moves into the next month. | |
1237 | Your users will feel better knowing how much of the data stream | |
1238 | has been processed. | |
1239 | ||
bdd9f424 | 1240 | |
6e411d20 SP |
1241 | Packfile Optimization |
1242 | --------------------- | |
882227f1 | 1243 | When packing a blob fast-import always attempts to deltify against the last |
6e411d20 SP |
1244 | blob written. Unless specifically arranged for by the frontend, |
1245 | this will probably not be a prior version of the same file, so the | |
1246 | generated delta will not be the smallest possible. The resulting | |
1247 | packfile will be compressed, but will not be optimal. | |
1248 | ||
1249 | Frontends which have efficient access to all revisions of a | |
1250 | single file (for example reading an RCS/CVS ,v file) can choose | |
1251 | to supply all revisions of that file as a sequence of consecutive | |
882227f1 | 1252 | `blob` commands. This allows fast-import to deltify the different file |
6e411d20 SP |
1253 | revisions against each other, saving space in the final packfile. |
1254 | Marks can be used to later identify individual file revisions during | |
1255 | a sequence of `commit` commands. | |
1256 | ||
882227f1 SP |
1257 | The packfile(s) created by fast-import do not encourage good disk access |
1258 | patterns. This is caused by fast-import writing the data in the order | |
6e411d20 SP |
1259 | it is received on standard input, while Git typically organizes |
1260 | data within packfiles to make the most recent (current tip) data | |
1261 | appear before historical data. Git also clusters commits together, | |
1262 | speeding up revision traversal through better cache locality. | |
1263 | ||
1264 | For this reason it is strongly recommended that users repack the | |
882227f1 | 1265 | repository with `git repack -a -d` after fast-import completes, allowing |
6e411d20 SP |
1266 | Git to reorganize the packfiles for faster data access. If blob |
1267 | deltas are suboptimal (see above) then also adding the `-f` option | |
1268 | to force recomputation of all deltas can significantly reduce the | |
1269 | final packfile size (30-50% smaller can be quite typical). | |
1270 | ||
bdd9f424 | 1271 | |
6e411d20 SP |
1272 | Memory Utilization |
1273 | ------------------ | |
882227f1 | 1274 | There are a number of factors which affect how much memory fast-import |
6e411d20 | 1275 | requires to perform an import. Like critical sections of core |
02783075 BH |
1276 | Git, fast-import uses its own memory allocators to amortize any overheads |
1277 | associated with malloc. In practice fast-import tends to amortize any | |
6e411d20 SP |
1278 | malloc overheads to 0, due to its use of large block allocations. |
1279 | ||
1280 | per object | |
1281 | ~~~~~~~~~~ | |
882227f1 | 1282 | fast-import maintains an in-memory structure for every object written in |
6e411d20 SP |
1283 | this execution. On a 32 bit system the structure is 32 bytes, |
1284 | on a 64 bit system the structure is 40 bytes (due to the larger | |
1285 | pointer sizes). Objects in the table are not deallocated until | |
882227f1 | 1286 | fast-import terminates. Importing 2 million objects on a 32 bit system |
6e411d20 SP |
1287 | will require approximately 64 MiB of memory. |
1288 | ||
1289 | The object table is actually a hashtable keyed on the object name | |
882227f1 | 1290 | (the unique SHA-1). This storage configuration allows fast-import to reuse |
6e411d20 SP |
1291 | an existing or already written object and avoid writing duplicates |
1292 | to the output packfile. Duplicate blobs are surprisingly common | |
1293 | in an import, typically due to branch merges in the source. | |
1294 | ||
1295 | per mark | |
1296 | ~~~~~~~~ | |
1297 | Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 | |
1298 | bytes, depending on pointer size) per mark. Although the array | |
1299 | is sparse, frontends are still strongly encouraged to use marks | |
1300 | between 1 and n, where n is the total number of marks required for | |
1301 | this import. | |
1302 | ||
1303 | per branch | |
1304 | ~~~~~~~~~~ | |
1305 | Branches are classified as active and inactive. The memory usage | |
1306 | of the two classes is significantly different. | |
1307 | ||
1308 | Inactive branches are stored in a structure which uses 96 or 120 | |
1309 | bytes (32 bit or 64 bit systems, respectively), plus the length of | |
882227f1 | 1310 | the branch name (typically under 200 bytes), per branch. fast-import will |
6e411d20 SP |
1311 | easily handle as many as 10,000 inactive branches in under 2 MiB |
1312 | of memory. | |
1313 | ||
1314 | Active branches have the same overhead as inactive branches, but | |
1315 | also contain copies of every tree that has been recently modified on | |
1316 | that branch. If subtree `include` has not been modified since the | |
1317 | branch became active, its contents will not be loaded into memory, | |
1318 | but if subtree `src` has been modified by a commit since the branch | |
1319 | became active, then its contents will be loaded in memory. | |
1320 | ||
1321 | As active branches store metadata about the files contained on that | |
1322 | branch, their in-memory storage size can grow to a considerable size | |
1323 | (see below). | |
1324 | ||
882227f1 | 1325 | fast-import automatically moves active branches to inactive status based on |
6e411d20 SP |
1326 | a simple least-recently-used algorithm. The LRU chain is updated on |
1327 | each `commit` command. The maximum number of active branches can be | |
c499d768 | 1328 | increased or decreased on the command line with \--active-branches=. |
6e411d20 SP |
1329 | |
1330 | per active tree | |
1331 | ~~~~~~~~~~~~~~~ | |
1332 | Trees (aka directories) use just 12 bytes of memory on top of the | |
1333 | memory required for their entries (see ``per active file'' below). | |
02783075 | 1334 | The cost of a tree is virtually 0, as its overhead amortizes out |
6e411d20 SP |
1335 | over the individual file entries. |
1336 | ||
1337 | per active file entry | |
1338 | ~~~~~~~~~~~~~~~~~~~~~ | |
1339 | Files (and pointers to subtrees) within active trees require 52 or 64 | |
1340 | bytes (32/64 bit platforms) per entry. To conserve space, file and | |
1341 | tree names are pooled in a common string table, allowing the filename | |
1342 | ``Makefile'' to use just 16 bytes (after including the string header | |
1343 | overhead) no matter how many times it occurs within the project. | |
1344 | ||
1345 | The active branch LRU, when coupled with the filename string pool | |
882227f1 | 1346 | and lazy loading of subtrees, allows fast-import to efficiently import |
6e411d20 SP |
1347 | projects with 2,000+ branches and 45,114+ files in a very limited |
1348 | memory footprint (less than 2.7 MiB per active branch). | |
1349 | ||
dc01f59d JN |
1350 | Signals |
1351 | ------- | |
1352 | Sending *SIGUSR1* to the 'git fast-import' process ends the current | |
1353 | packfile early, simulating a `checkpoint` command. The impatient | |
1354 | operator can use this facility to peek at the objects and refs from an | |
1355 | import in progress, at the cost of some added running time and worse | |
1356 | compression. | |
6e411d20 | 1357 | |
6e411d20 SP |
1358 | GIT |
1359 | --- | |
9e1f0a85 | 1360 | Part of the linkgit:git[1] suite |