]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/git-fast-import.txt
fast-import: Hide the pack boundary commits by default.
[thirdparty/git.git] / Documentation / git-fast-import.txt
1 git-fast-import(1)
2 ==================
3
4 NAME
5 ----
6 git-fast-import - Backend for fast Git data importers.
7
8
9 SYNOPSIS
10 --------
11 frontend | 'git-fast-import' [options]
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
18 stored there to git-fast-import.
19
20 fast-import reads a mixed command/data stream from standard input and
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
26 The fast-import backend itself can import into an empty repository (one that
27 has already been initialized by gitlink:git-init[1]) or incrementally
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 -------
35 --date-format=<fmt>::
36 Specify the type of dates the frontend will supply to
37 fast-import within `author`, `committer` and `tagger` commands.
38 See ``Date Formats'' below for details about which formats
39 are supported, and their syntax.
40
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
46 --max-pack-size=<n>::
47 Maximum size of each output packfile, expressed in MiB.
48 The default is 4096 (4 GiB) as that is the maximum allowed
49 packfile size (due to file format limitations). Some
50 importers may wish to lower this, such as to ensure the
51 resulting packfiles fit on CDs.
52
53 --depth=<n>::
54 Maximum delta depth, for blob and tree deltification.
55 Default is 10.
56
57 --active-branches=<n>::
58 Maximum number of branches to maintain active at once.
59 See ``Memory Utilization'' below for details. Default is 5.
60
61 --export-marks=<file>::
62 Dumps the internal marks table to <file> when complete.
63 Marks are written one per line as `:markid SHA-1`.
64 Frontends can use this file to validate imports after they
65 have been completed.
66
67 --export-pack-edges=<file>::
68 After creating a packfile, print a line of data to
69 <file> listing the filename of the packfile and the last
70 commit on each branch that was written to that packfile.
71 This information may be useful after importing projects
72 whose total object set exceeds the 4 GiB packfile limit,
73 as these commits can be used as edge points during calls
74 to gitlink:git-pack-objects[1].
75
76 --quiet::
77 Disable all non-fatal output, making fast-import silent when it
78 is successful. This option disables the output shown by
79 \--stats.
80
81 --stats::
82 Display some basic statistics about the objects fast-import has
83 created, the packfiles they were stored into, and the
84 memory used by fast-import during this run. Showing this output
85 is currently the default, but can be disabled with \--quiet.
86
87
88 Performance
89 -----------
90 The design of fast-import allows it to import large projects in a minimum
91 amount of memory usage and processing time. Assuming the frontend
92 is able to keep up with fast-import and feed it a constant stream of data,
93 import times for projects holding 10+ years of history and containing
94 100,000+ individual commits are generally completed in just 1-2
95 hours on quite modest (~$2,000 USD) hardware.
96
97 Most bottlenecks appear to be in foreign source data access (the
98 source just cannot extract revisions fast enough) or disk IO (fast-import
99 writes as fast as the disk will take the data). Imports will run
100 faster if the source data is stored on a different drive than the
101 destination Git repository (due to less IO contention).
102
103
104 Development Cost
105 ----------------
106 A typical frontend for fast-import tends to weigh in at approximately 200
107 lines of Perl/Python/Ruby code. Most developers have been able to
108 create working importers in just a couple of hours, even though it
109 is their first exposure to fast-import, and sometimes even to Git. This is
110 an ideal situation, given that most conversion tools are throw-away
111 (use once, and never look back).
112
113
114 Parallel Operation
115 ------------------
116 Like `git-push` or `git-fetch`, imports handled by fast-import are safe to
117 run alongside parallel `git repack -a -d` or `git gc` invocations,
118 or any other Git operation (including `git prune`, as loose objects
119 are never used by fast-import).
120
121 fast-import does not lock the branch or tag refs it is actively importing.
122 After the import, during its ref update phase, fast-import tests each
123 existing branch ref to verify the update will be a fast-forward
124 update (the commit stored in the ref is contained in the new
125 history of the commit to be written). If the update is not a
126 fast-forward update, fast-import will skip updating that ref and instead
127 prints a warning message. fast-import will always attempt to update all
128 branch refs, and does not stop on the first failure.
129
130 Branch updates can be forced with \--force, but its recommended that
131 this only be used on an otherwise quiet repository. Using \--force
132 is not necessary for an initial import into an empty repository.
133
134
135 Technical Discussion
136 --------------------
137 fast-import tracks a set of branches in memory. Any branch can be created
138 or modified at any point during the import process by sending a
139 `commit` command on the input stream. This design allows a frontend
140 program to process an unlimited number of branches simultaneously,
141 generating commits in the order they are available from the source
142 data. It also simplifies the frontend programs considerably.
143
144 fast-import does not use or alter the current working directory, or any
145 file within it. (It does however update the current Git repository,
146 as referenced by `GIT_DIR`.) Therefore an import frontend may use
147 the working directory for its own purposes, such as extracting file
148 revisions from the foreign source. This ignorance of the working
149 directory also allows fast-import to run very quickly, as it does not
150 need to perform any costly file update operations when switching
151 between branches.
152
153 Input Format
154 ------------
155 With the exception of raw file data (which Git does not interpret)
156 the fast-import input format is text (ASCII) based. This text based
157 format simplifies development and debugging of frontend programs,
158 especially when a higher level language such as Perl, Python or
159 Ruby is being used.
160
161 fast-import is very strict about its input. Where we say SP below we mean
162 *exactly* one space. Likewise LF means one (and only one) linefeed.
163 Supplying additional whitespace characters will cause unexpected
164 results, such as branch names or file names with leading or trailing
165 spaces in their name, or early termination of fast-import when it encounters
166 unexpected input.
167
168 Date Formats
169 ~~~~~~~~~~~~
170 The following date formats are supported. A frontend should select
171 the format it will use for this import by passing the format name
172 in the \--date-format=<fmt> command line option.
173
174 `raw`::
175 This is the Git native format and is `<time> SP <offutc>`.
176 It is also fast-import's default format, if \--date-format was
177 not specified.
178 +
179 The time of the event is specified by `<time>` as the number of
180 seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is
181 written as an ASCII decimal integer.
182 +
183 The local offset is specified by `<offutc>` as a positive or negative
184 offset from UTC. For example EST (which is 5 hours behind UTC)
185 would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''.
186 The local offset does not affect `<time>`; it is used only as an
187 advisement to help formatting routines display the timestamp.
188 +
189 If the local offset is not available in the source material, use
190 ``+0000'', or the most common local offset. For example many
191 organizations have a CVS repository which has only ever been accessed
192 by users who are located in the same location and timezone. In this
193 case a reasonable offset from UTC could be assumed.
194 +
195 Unlike the `rfc2822` format, this format is very strict. Any
196 variation in formatting will cause fast-import to reject the value.
197
198 `rfc2822`::
199 This is the standard email format as described by RFC 2822.
200 +
201 An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git
202 parser is accurate, but a little on the lenient side. It is the
203 same parser used by gitlink:git-am[1] when applying patches
204 received from email.
205 +
206 Some malformed strings may be accepted as valid dates. In some of
207 these cases Git will still be able to obtain the correct date from
208 the malformed string. There are also some types of malformed
209 strings which Git will parse wrong, and yet consider valid.
210 Seriously malformed strings will be rejected.
211 +
212 Unlike the `raw` format above, the timezone/UTC offset information
213 contained in an RFC 2822 date string is used to adjust the date
214 value to UTC prior to storage. Therefore it is important that
215 this information be as accurate as possible.
216 +
217 If the source material uses RFC 2822 style dates,
218 the frontend should let fast-import handle the parsing and conversion
219 (rather than attempting to do it itself) as the Git parser has
220 been well tested in the wild.
221 +
222 Frontends should prefer the `raw` format if the source material
223 already uses UNIX-epoch format, can be coaxed to give dates in that
224 format, or its format is easiliy convertible to it, as there is no
225 ambiguity in parsing.
226
227 `now`::
228 Always use the current time and timezone. The literal
229 `now` must always be supplied for `<when>`.
230 +
231 This is a toy format. The current time and timezone of this system
232 is always copied into the identity string at the time it is being
233 created by fast-import. There is no way to specify a different time or
234 timezone.
235 +
236 This particular format is supplied as its short to implement and
237 may be useful to a process that wants to create a new commit
238 right now, without needing to use a working directory or
239 gitlink:git-update-index[1].
240 +
241 If separate `author` and `committer` commands are used in a `commit`
242 the timestamps may not match, as the system clock will be polled
243 twice (once for each command). The only way to ensure that both
244 author and committer identity information has the same timestamp
245 is to omit `author` (thus copying from `committer`) or to use a
246 date format other than `now`.
247
248 Commands
249 ~~~~~~~~
250 fast-import accepts several commands to update the current repository
251 and control the current import process. More detailed discussion
252 (with examples) of each command follows later.
253
254 `commit`::
255 Creates a new branch or updates an existing branch by
256 creating a new commit and updating the branch to point at
257 the newly created commit.
258
259 `tag`::
260 Creates an annotated tag object from an existing commit or
261 branch. Lightweight tags are not supported by this command,
262 as they are not recommended for recording meaningful points
263 in time.
264
265 `reset`::
266 Reset an existing branch (or a new branch) to a specific
267 revision. This command must be used to change a branch to
268 a specific revision without making a commit on it.
269
270 `blob`::
271 Convert raw file data into a blob, for future use in a
272 `commit` command. This command is optional and is not
273 needed to perform an import.
274
275 `checkpoint`::
276 Forces fast-import to close the current packfile, generate its
277 unique SHA-1 checksum and index, and start a new packfile.
278 This command is optional and is not needed to perform
279 an import.
280
281 `commit`
282 ~~~~~~~~
283 Create or update a branch with a new commit, recording one logical
284 change to the project.
285
286 ....
287 'commit' SP <ref> LF
288 mark?
289 ('author' SP <name> SP LT <email> GT SP <when> LF)?
290 'committer' SP <name> SP LT <email> GT SP <when> LF
291 data
292 ('from' SP <committish> LF)?
293 ('merge' SP <committish> LF)?
294 (filemodify | filedelete | filedeleteall)*
295 LF
296 ....
297
298 where `<ref>` is the name of the branch to make the commit on.
299 Typically branch names are prefixed with `refs/heads/` in
300 Git, so importing the CVS branch symbol `RELENG-1_0` would use
301 `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of
302 `<ref>` must be a valid refname in Git. As `LF` is not valid in
303 a Git refname, no quoting or escaping syntax is supported here.
304
305 A `mark` command may optionally appear, requesting fast-import to save a
306 reference to the newly created commit for future use by the frontend
307 (see below for format). It is very common for frontends to mark
308 every commit they create, thereby allowing future branch creation
309 from any imported commit.
310
311 The `data` command following `committer` must supply the commit
312 message (see below for `data` command syntax). To import an empty
313 commit message use a 0 length data. Commit messages are free-form
314 and are not interpreted by Git. Currently they must be encoded in
315 UTF-8, as fast-import does not permit other encodings to be specified.
316
317 Zero or more `filemodify`, `filedelete` and `filedeleteall` commands
318 may be included to update the contents of the branch prior to
319 creating the commit. These commands may be supplied in any order.
320 However it is recommended that a `filedeleteall` command preceed
321 all `filemodify` commands in the same commit, as `filedeleteall`
322 wipes the branch clean (see below).
323
324 `author`
325 ^^^^^^^^
326 An `author` command may optionally appear, if the author information
327 might differ from the committer information. If `author` is omitted
328 then fast-import will automatically use the committer's information for
329 the author portion of the commit. See below for a description of
330 the fields in `author`, as they are identical to `committer`.
331
332 `committer`
333 ^^^^^^^^^^^
334 The `committer` command indicates who made this commit, and when
335 they made it.
336
337 Here `<name>` is the person's display name (for example
338 ``Com M Itter'') and `<email>` is the person's email address
339 (``cm@example.com''). `LT` and `GT` are the literal less-than (\x3c)
340 and greater-than (\x3e) symbols. These are required to delimit
341 the email address from the other fields in the line. Note that
342 `<name>` is free-form and may contain any sequence of bytes, except
343 `LT` and `LF`. It is typically UTF-8 encoded.
344
345 The time of the change is specified by `<when>` using the date format
346 that was selected by the \--date-format=<fmt> command line option.
347 See ``Date Formats'' above for the set of supported formats, and
348 their syntax.
349
350 `from`
351 ^^^^^^
352 Only valid for the first commit made on this branch by this
353 fast-import process. The `from` command is used to specify the commit
354 to initialize this branch from. This revision will be the first
355 ancestor of the new commit.
356
357 Omitting the `from` command in the first commit of a new branch will
358 cause fast-import to create that commit with no ancestor. This tends to be
359 desired only for the initial commit of a project. Omitting the
360 `from` command on existing branches is required, as the current
361 commit on that branch is automatically assumed to be the first
362 ancestor of the new commit.
363
364 As `LF` is not valid in a Git refname or SHA-1 expression, no
365 quoting or escaping syntax is supported within `<committish>`.
366
367 Here `<committish>` is any of the following:
368
369 * The name of an existing branch already in fast-import's internal branch
370 table. If fast-import doesn't know the name, its treated as a SHA-1
371 expression.
372
373 * A mark reference, `:<idnum>`, where `<idnum>` is the mark number.
374 +
375 The reason fast-import uses `:` to denote a mark reference is this character
376 is not legal in a Git branch name. The leading `:` makes it easy
377 to distingush between the mark 42 (`:42`) and the branch 42 (`42`
378 or `refs/heads/42`), or an abbreviated SHA-1 which happened to
379 consist only of base-10 digits.
380 +
381 Marks must be declared (via `mark`) before they can be used.
382
383 * A complete 40 byte or abbreviated commit SHA-1 in hex.
384
385 * Any valid Git SHA-1 expression that resolves to a commit. See
386 ``SPECIFYING REVISIONS'' in gitlink:git-rev-parse[1] for details.
387
388 The special case of restarting an incremental import from the
389 current branch value should be written as:
390 ----
391 from refs/heads/branch^0
392 ----
393 The `{caret}0` suffix is necessary as fast-import does not permit a branch to
394 start from itself, and the branch is created in memory before the
395 `from` command is even read from the input. Adding `{caret}0` will force
396 fast-import to resolve the commit through Git's revision parsing library,
397 rather than its internal branch table, thereby loading in the
398 existing value of the branch.
399
400 `merge`
401 ^^^^^^^
402 Includes one additional ancestor commit, and makes the current
403 commit a merge commit. An unlimited number of `merge` commands per
404 commit are permitted by fast-import, thereby establishing an n-way merge.
405 However Git's other tools never create commits with more than 15
406 additional ancestors (forming a 16-way merge). For this reason
407 it is suggested that frontends do not use more than 15 `merge`
408 commands per commit.
409
410 Here `<committish>` is any of the commit specification expressions
411 also accepted by `from` (see above).
412
413 `filemodify`
414 ^^^^^^^^^^^^
415 Included in a `commit` command to add a new file or change the
416 content of an existing file. This command has two different means
417 of specifying the content of the file.
418
419 External data format::
420 The data content for the file was already supplied by a prior
421 `blob` command. The frontend just needs to connect it.
422 +
423 ....
424 'M' SP <mode> SP <dataref> SP <path> LF
425 ....
426 +
427 Here `<dataref>` can be either a mark reference (`:<idnum>`)
428 set by a prior `blob` command, or a full 40-byte SHA-1 of an
429 existing Git blob object.
430
431 Inline data format::
432 The data content for the file has not been supplied yet.
433 The frontend wants to supply it as part of this modify
434 command.
435 +
436 ....
437 'M' SP <mode> SP 'inline' SP <path> LF
438 data
439 ....
440 +
441 See below for a detailed description of the `data` command.
442
443 In both formats `<mode>` is the type of file entry, specified
444 in octal. Git only supports the following modes:
445
446 * `100644` or `644`: A normal (not-executable) file. The majority
447 of files in most projects use this mode. If in doubt, this is
448 what you want.
449 * `100755` or `755`: A normal, but executable, file.
450 * `120000`: A symlink, the content of the file will be the link target.
451
452 In both formats `<path>` is the complete path of the file to be added
453 (if not already existing) or modified (if already existing).
454
455 A `<path>` string must use UNIX-style directory seperators (forward
456 slash `/`), may contain any byte other than `LF`, and must not
457 start with double quote (`"`).
458
459 If an `LF` or double quote must be encoded into `<path>` shell-style
460 quoting should be used, e.g. `"path/with\n and \" in it"`.
461
462 The value of `<path>` must be in canoncial form. That is it must not:
463
464 * contain an empty directory component (e.g. `foo//bar` is invalid),
465 * end with a directory seperator (e.g. `foo/` is invalid),
466 * start with a directory seperator (e.g. `/foo` is invalid),
467 * contain the special component `.` or `..` (e.g. `foo/./bar` and
468 `foo/../bar` are invalid).
469
470 It is recommended that `<path>` always be encoded using UTF-8.
471
472 `filedelete`
473 ^^^^^^^^^^^^
474 Included in a `commit` command to remove a file from the branch.
475 If the file removal makes its directory empty, the directory will
476 be automatically removed too. This cascades up the tree until the
477 first non-empty directory or the root is reached.
478
479 ....
480 'D' SP <path> LF
481 ....
482
483 here `<path>` is the complete path of the file to be removed.
484 See `filemodify` above for a detailed description of `<path>`.
485
486 `filedeleteall`
487 ^^^^^^^^^^^^^^^
488 Included in a `commit` command to remove all files (and also all
489 directories) from the branch. This command resets the internal
490 branch structure to have no files in it, allowing the frontend
491 to subsequently add all interesting files from scratch.
492
493 ....
494 'deleteall' LF
495 ....
496
497 This command is extremely useful if the frontend does not know
498 (or does not care to know) what files are currently on the branch,
499 and therefore cannot generate the proper `filedelete` commands to
500 update the content.
501
502 Issuing a `filedeleteall` followed by the needed `filemodify`
503 commands to set the correct content will produce the same results
504 as sending only the needed `filemodify` and `filedelete` commands.
505 The `filedeleteall` approach may however require fast-import to use slightly
506 more memory per active branch (less than 1 MiB for even most large
507 projects); so frontends that can easily obtain only the affected
508 paths for a commit are encouraged to do so.
509
510 `mark`
511 ~~~~~~
512 Arranges for fast-import to save a reference to the current object, allowing
513 the frontend to recall this object at a future point in time, without
514 knowing its SHA-1. Here the current object is the object creation
515 command the `mark` command appears within. This can be `commit`,
516 `tag`, and `blob`, but `commit` is the most common usage.
517
518 ....
519 'mark' SP ':' <idnum> LF
520 ....
521
522 where `<idnum>` is the number assigned by the frontend to this mark.
523 The value of `<idnum>` is expressed as an ASCII decimal integer.
524 The value 0 is reserved and cannot be used as
525 a mark. Only values greater than or equal to 1 may be used as marks.
526
527 New marks are created automatically. Existing marks can be moved
528 to another object simply by reusing the same `<idnum>` in another
529 `mark` command.
530
531 `tag`
532 ~~~~~
533 Creates an annotated tag referring to a specific commit. To create
534 lightweight (non-annotated) tags see the `reset` command below.
535
536 ....
537 'tag' SP <name> LF
538 'from' SP <committish> LF
539 'tagger' SP <name> SP LT <email> GT SP <when> LF
540 data
541 LF
542 ....
543
544 where `<name>` is the name of the tag to create.
545
546 Tag names are automatically prefixed with `refs/tags/` when stored
547 in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would
548 use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the
549 corresponding ref as `refs/tags/RELENG-1_0-FINAL`.
550
551 The value of `<name>` must be a valid refname in Git and therefore
552 may contain forward slashes. As `LF` is not valid in a Git refname,
553 no quoting or escaping syntax is supported here.
554
555 The `from` command is the same as in the `commit` command; see
556 above for details.
557
558 The `tagger` command uses the same format as `committer` within
559 `commit`; again see above for details.
560
561 The `data` command following `tagger` must supply the annotated tag
562 message (see below for `data` command syntax). To import an empty
563 tag message use a 0 length data. Tag messages are free-form and are
564 not interpreted by Git. Currently they must be encoded in UTF-8,
565 as fast-import does not permit other encodings to be specified.
566
567 Signing annotated tags during import from within fast-import is not
568 supported. Trying to include your own PGP/GPG signature is not
569 recommended, as the frontend does not (easily) have access to the
570 complete set of bytes which normally goes into such a signature.
571 If signing is required, create lightweight tags from within fast-import with
572 `reset`, then create the annotated versions of those tags offline
573 with the standard gitlink:git-tag[1] process.
574
575 `reset`
576 ~~~~~~~
577 Creates (or recreates) the named branch, optionally starting from
578 a specific revision. The reset command allows a frontend to issue
579 a new `from` command for an existing branch, or to create a new
580 branch from an existing commit without creating a new commit.
581
582 ....
583 'reset' SP <ref> LF
584 ('from' SP <committish> LF)?
585 LF
586 ....
587
588 For a detailed description of `<ref>` and `<committish>` see above
589 under `commit` and `from`.
590
591 The `reset` command can also be used to create lightweight
592 (non-annotated) tags. For example:
593
594 ====
595 reset refs/tags/938
596 from :938
597 ====
598
599 would create the lightweight tag `refs/tags/938` referring to
600 whatever commit mark `:938` references.
601
602 `blob`
603 ~~~~~~
604 Requests writing one file revision to the packfile. The revision
605 is not connected to any commit; this connection must be formed in
606 a subsequent `commit` command by referencing the blob through an
607 assigned mark.
608
609 ....
610 'blob' LF
611 mark?
612 data
613 ....
614
615 The mark command is optional here as some frontends have chosen
616 to generate the Git SHA-1 for the blob on their own, and feed that
617 directly to `commit`. This is typically more work than its worth
618 however, as marks are inexpensive to store and easy to use.
619
620 `data`
621 ~~~~~~
622 Supplies raw data (for use as blob/file content, commit messages, or
623 annotated tag messages) to fast-import. Data can be supplied using an exact
624 byte count or delimited with a terminating line. Real frontends
625 intended for production-quality conversions should always use the
626 exact byte count format, as it is more robust and performs better.
627 The delimited format is intended primarily for testing fast-import.
628
629 Exact byte count format::
630 The frontend must specify the number of bytes of data.
631 +
632 ....
633 'data' SP <count> LF
634 <raw> LF
635 ....
636 +
637 where `<count>` is the exact number of bytes appearing within
638 `<raw>`. The value of `<count>` is expressed as an ASCII decimal
639 integer. The `LF` on either side of `<raw>` is not
640 included in `<count>` and will not be included in the imported data.
641
642 Delimited format::
643 A delimiter string is used to mark the end of the data.
644 fast-import will compute the length by searching for the delimiter.
645 This format is primarly useful for testing and is not
646 recommended for real data.
647 +
648 ....
649 'data' SP '<<' <delim> LF
650 <raw> LF
651 <delim> LF
652 ....
653 +
654 where `<delim>` is the chosen delimiter string. The string `<delim>`
655 must not appear on a line by itself within `<raw>`, as otherwise
656 fast-import will think the data ends earlier than it really does. The `LF`
657 immediately trailing `<raw>` is part of `<raw>`. This is one of
658 the limitations of the delimited format, it is impossible to supply
659 a data chunk which does not have an LF as its last byte.
660
661 `checkpoint`
662 ~~~~~~~~~~~~
663 Forces fast-import to close the current packfile, start a new one, and to
664 save out all current branch refs, tags and marks.
665
666 ....
667 'checkpoint' LF
668 LF
669 ....
670
671 Note that fast-import automatically switches packfiles when the current
672 packfile reaches \--max-pack-size, or 4 GiB, whichever limit is
673 smaller. During an automatic packfile switch fast-import does not update
674 the branch refs, tags or marks.
675
676 As a `checkpoint` can require a significant amount of CPU time and
677 disk IO (to compute the overall pack SHA-1 checksum, generate the
678 corresponding index file, and update the refs) it can easily take
679 several minutes for a single `checkpoint` command to complete.
680
681 Frontends may choose to issue checkpoints during extremely large
682 and long running imports, or when they need to allow another Git
683 process access to a branch. However given that a 30 GiB Subversion
684 repository can be loaded into Git through fast-import in about 3 hours,
685 explicit checkpointing may not be necessary.
686
687
688 Tips and Tricks
689 ---------------
690 The following tips and tricks have been collected from various
691 users of fast-import, and are offered here as suggestions.
692
693 Use One Mark Per Commit
694 ~~~~~~~~~~~~~~~~~~~~~~~
695 When doing a repository conversion, use a unique mark per commit
696 (`mark :<n>`) and supply the \--export-marks option on the command
697 line. fast-import will dump a file which lists every mark and the Git
698 object SHA-1 that corresponds to it. If the frontend can tie
699 the marks back to the source repository, it is easy to verify the
700 accuracy and completeness of the import by comparing each Git
701 commit to the corresponding source revision.
702
703 Coming from a system such as Perforce or Subversion this should be
704 quite simple, as the fast-import mark can also be the Perforce changeset
705 number or the Subversion revision number.
706
707 Freely Skip Around Branches
708 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
709 Don't bother trying to optimize the frontend to stick to one branch
710 at a time during an import. Although doing so might be slightly
711 faster for fast-import, it tends to increase the complexity of the frontend
712 code considerably.
713
714 The branch LRU builtin to fast-import tends to behave very well, and the
715 cost of activating an inactive branch is so low that bouncing around
716 between branches has virtually no impact on import performance.
717
718 Use Tag Fixup Branches
719 ~~~~~~~~~~~~~~~~~~~~~~
720 Some other SCM systems let the user create a tag from multiple
721 files which are not from the same commit/changeset. Or to create
722 tags which are a subset of the files available in the repository.
723
724 Importing these tags as-is in Git is impossible without making at
725 least one commit which ``fixes up'' the files to match the content
726 of the tag. Use fast-import's `reset` command to reset a dummy branch
727 outside of your normal branch space to the base commit for the tag,
728 then commit one or more file fixup commits, and finally tag the
729 dummy branch.
730
731 For example since all normal branches are stored under `refs/heads/`
732 name the tag fixup branch `TAG_FIXUP`. This way it is impossible for
733 the fixup branch used by the importer to have namespace conflicts
734 with real branches imported from the source (the name `TAG_FIXUP`
735 is not `refs/heads/TAG_FIXUP`).
736
737 When committing fixups, consider using `merge` to connect the
738 commit(s) which are supplying file revisions to the fixup branch.
739 Doing so will allow tools such as gitlink:git-blame[1] to track
740 through the real commit history and properly annotate the source
741 files.
742
743 After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP`
744 to remove the dummy branch.
745
746 Import Now, Repack Later
747 ~~~~~~~~~~~~~~~~~~~~~~~~
748 As soon as fast-import completes the Git repository is completely valid
749 and ready for use. Typicallly this takes only a very short time,
750 even for considerably large projects (100,000+ commits).
751
752 However repacking the repository is necessary to improve data
753 locality and access performance. It can also take hours on extremely
754 large projects (especially if -f and a large \--window parameter is
755 used). Since repacking is safe to run alongside readers and writers,
756 run the repack in the background and let it finish when it finishes.
757 There is no reason to wait to explore your new Git project!
758
759 If you choose to wait for the repack, don't try to run benchmarks
760 or performance tests until repacking is completed. fast-import outputs
761 suboptimal packfiles that are simply never seen in real use
762 situations.
763
764 Repacking Historical Data
765 ~~~~~~~~~~~~~~~~~~~~~~~~~
766 If you are repacking very old imported data (e.g. older than the
767 last year), consider expending some extra CPU time and supplying
768 \--window=50 (or higher) when you run gitlink:git-repack[1].
769 This will take longer, but will also produce a smaller packfile.
770 You only need to expend the effort once, and everyone using your
771 project will benefit from the smaller repository.
772
773
774 Packfile Optimization
775 ---------------------
776 When packing a blob fast-import always attempts to deltify against the last
777 blob written. Unless specifically arranged for by the frontend,
778 this will probably not be a prior version of the same file, so the
779 generated delta will not be the smallest possible. The resulting
780 packfile will be compressed, but will not be optimal.
781
782 Frontends which have efficient access to all revisions of a
783 single file (for example reading an RCS/CVS ,v file) can choose
784 to supply all revisions of that file as a sequence of consecutive
785 `blob` commands. This allows fast-import to deltify the different file
786 revisions against each other, saving space in the final packfile.
787 Marks can be used to later identify individual file revisions during
788 a sequence of `commit` commands.
789
790 The packfile(s) created by fast-import do not encourage good disk access
791 patterns. This is caused by fast-import writing the data in the order
792 it is received on standard input, while Git typically organizes
793 data within packfiles to make the most recent (current tip) data
794 appear before historical data. Git also clusters commits together,
795 speeding up revision traversal through better cache locality.
796
797 For this reason it is strongly recommended that users repack the
798 repository with `git repack -a -d` after fast-import completes, allowing
799 Git to reorganize the packfiles for faster data access. If blob
800 deltas are suboptimal (see above) then also adding the `-f` option
801 to force recomputation of all deltas can significantly reduce the
802 final packfile size (30-50% smaller can be quite typical).
803
804
805 Memory Utilization
806 ------------------
807 There are a number of factors which affect how much memory fast-import
808 requires to perform an import. Like critical sections of core
809 Git, fast-import uses its own memory allocators to ammortize any overheads
810 associated with malloc. In practice fast-import tends to ammoritize any
811 malloc overheads to 0, due to its use of large block allocations.
812
813 per object
814 ~~~~~~~~~~
815 fast-import maintains an in-memory structure for every object written in
816 this execution. On a 32 bit system the structure is 32 bytes,
817 on a 64 bit system the structure is 40 bytes (due to the larger
818 pointer sizes). Objects in the table are not deallocated until
819 fast-import terminates. Importing 2 million objects on a 32 bit system
820 will require approximately 64 MiB of memory.
821
822 The object table is actually a hashtable keyed on the object name
823 (the unique SHA-1). This storage configuration allows fast-import to reuse
824 an existing or already written object and avoid writing duplicates
825 to the output packfile. Duplicate blobs are surprisingly common
826 in an import, typically due to branch merges in the source.
827
828 per mark
829 ~~~~~~~~
830 Marks are stored in a sparse array, using 1 pointer (4 bytes or 8
831 bytes, depending on pointer size) per mark. Although the array
832 is sparse, frontends are still strongly encouraged to use marks
833 between 1 and n, where n is the total number of marks required for
834 this import.
835
836 per branch
837 ~~~~~~~~~~
838 Branches are classified as active and inactive. The memory usage
839 of the two classes is significantly different.
840
841 Inactive branches are stored in a structure which uses 96 or 120
842 bytes (32 bit or 64 bit systems, respectively), plus the length of
843 the branch name (typically under 200 bytes), per branch. fast-import will
844 easily handle as many as 10,000 inactive branches in under 2 MiB
845 of memory.
846
847 Active branches have the same overhead as inactive branches, but
848 also contain copies of every tree that has been recently modified on
849 that branch. If subtree `include` has not been modified since the
850 branch became active, its contents will not be loaded into memory,
851 but if subtree `src` has been modified by a commit since the branch
852 became active, then its contents will be loaded in memory.
853
854 As active branches store metadata about the files contained on that
855 branch, their in-memory storage size can grow to a considerable size
856 (see below).
857
858 fast-import automatically moves active branches to inactive status based on
859 a simple least-recently-used algorithm. The LRU chain is updated on
860 each `commit` command. The maximum number of active branches can be
861 increased or decreased on the command line with \--active-branches=.
862
863 per active tree
864 ~~~~~~~~~~~~~~~
865 Trees (aka directories) use just 12 bytes of memory on top of the
866 memory required for their entries (see ``per active file'' below).
867 The cost of a tree is virtually 0, as its overhead ammortizes out
868 over the individual file entries.
869
870 per active file entry
871 ~~~~~~~~~~~~~~~~~~~~~
872 Files (and pointers to subtrees) within active trees require 52 or 64
873 bytes (32/64 bit platforms) per entry. To conserve space, file and
874 tree names are pooled in a common string table, allowing the filename
875 ``Makefile'' to use just 16 bytes (after including the string header
876 overhead) no matter how many times it occurs within the project.
877
878 The active branch LRU, when coupled with the filename string pool
879 and lazy loading of subtrees, allows fast-import to efficiently import
880 projects with 2,000+ branches and 45,114+ files in a very limited
881 memory footprint (less than 2.7 MiB per active branch).
882
883
884 Author
885 ------
886 Written by Shawn O. Pearce <spearce@spearce.org>.
887
888 Documentation
889 --------------
890 Documentation by Shawn O. Pearce <spearce@spearce.org>.
891
892 GIT
893 ---
894 Part of the gitlink:git[7] suite
895