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