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 'git init') 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. 48 The default is unlimited. 49 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 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 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. 80 81--relative-marks:: 82 After specifying --relative-marks= the paths specified 83 with --import-marks= and --export-marks= are relative 84 to an internal directory in the current repository. 85 In git-fast-import this means that the paths are relative 86 to the .git/info/fast-import directory. However, other 87 importers may use a different location. 88 89--no-relative-marks:: 90 Negates a previous --relative-marks. Allows for combining 91 relative and non-relative marks by interweaving 92 --(no-)-relative-marks= with the --(import|export)-marks= 93 options. 94 95--export-pack-edges=<file>:: 96 After creating a packfile, print a line of data to 97 <file> listing the filename of the packfile and the last 98 commit on each branch that was written to that packfile. 99 This information may be useful after importing projects 100 whose total object set exceeds the 4 GiB packfile limit, 101 as these commits can be used as edge points during calls 102 to 'git pack-objects'. 103 104--quiet:: 105 Disable all non-fatal output, making fast-import silent when it 106 is successful. This option disables the output shown by 107 \--stats. 108 109--stats:: 110 Display some basic statistics about the objects fast-import has 111 created, the packfiles they were stored into, and the 112 memory used by fast-import during this run. Showing this output 113 is currently the default, but can be disabled with \--quiet. 114 115 116Performance 117----------- 118The design of fast-import allows it to import large projects in a minimum 119amount of memory usage and processing time. Assuming the frontend 120is able to keep up with fast-import and feed it a constant stream of data, 121import times for projects holding 10+ years of history and containing 122100,000+ individual commits are generally completed in just 1-2 123hours on quite modest (~$2,000 USD) hardware. 124 125Most bottlenecks appear to be in foreign source data access (the 126source just cannot extract revisions fast enough) or disk IO (fast-import 127writes as fast as the disk will take the data). Imports will run 128faster if the source data is stored on a different drive than the 129destination Git repository (due to less IO contention). 130 131 132Development Cost 133---------------- 134A typical frontend for fast-import tends to weigh in at approximately 200 135lines of Perl/Python/Ruby code. Most developers have been able to 136create working importers in just a couple of hours, even though it 137is their first exposure to fast-import, and sometimes even to Git. This is 138an ideal situation, given that most conversion tools are throw-away 139(use once, and never look back). 140 141 142Parallel Operation 143------------------ 144Like 'git push' or 'git fetch', imports handled by fast-import are safe to 145run alongside parallel `git repack -a -d` or `git gc` invocations, 146or any other Git operation (including 'git prune', as loose objects 147are never used by fast-import). 148 149fast-import does not lock the branch or tag refs it is actively importing. 150After the import, during its ref update phase, fast-import tests each 151existing branch ref to verify the update will be a fast-forward 152update (the commit stored in the ref is contained in the new 153history of the commit to be written). If the update is not a 154fast-forward update, fast-import will skip updating that ref and instead 155prints a warning message. fast-import will always attempt to update all 156branch refs, and does not stop on the first failure. 157 158Branch updates can be forced with \--force, but it's recommended that 159this only be used on an otherwise quiet repository. Using \--force 160is not necessary for an initial import into an empty repository. 161 162 163Technical Discussion 164-------------------- 165fast-import tracks a set of branches in memory. Any branch can be created 166or modified at any point during the import process by sending a 167`commit` command on the input stream. This design allows a frontend 168program to process an unlimited number of branches simultaneously, 169generating commits in the order they are available from the source 170data. It also simplifies the frontend programs considerably. 171 172fast-import does not use or alter the current working directory, or any 173file within it. (It does however update the current Git repository, 174as referenced by `GIT_DIR`.) Therefore an import frontend may use 175the working directory for its own purposes, such as extracting file 176revisions from the foreign source. This ignorance of the working 177directory also allows fast-import to run very quickly, as it does not 178need to perform any costly file update operations when switching 179between branches. 180 181Input Format 182------------ 183With the exception of raw file data (which Git does not interpret) 184the fast-import input format is text (ASCII) based. This text based 185format simplifies development and debugging of frontend programs, 186especially when a higher level language such as Perl, Python or 187Ruby is being used. 188 189fast-import is very strict about its input. Where we say SP below we mean 190*exactly* one space. Likewise LF means one (and only one) linefeed. 191Supplying additional whitespace characters will cause unexpected 192results, such as branch names or file names with leading or trailing 193spaces in their name, or early termination of fast-import when it encounters 194unexpected input. 195 196Stream Comments 197~~~~~~~~~~~~~~~ 198To aid in debugging frontends fast-import ignores any line that 199begins with `#` (ASCII pound/hash) up to and including the line 200ending `LF`. A comment line may contain any sequence of bytes 201that does not contain an LF and therefore may be used to include 202any detailed debugging information that might be specific to the 203frontend and useful when inspecting a fast-import data stream. 204 205Date Formats 206~~~~~~~~~~~~ 207The following date formats are supported. A frontend should select 208the format it will use for this import by passing the format name 209in the \--date-format=<fmt> command line option. 210 211`raw`:: 212 This is the Git native format and is `<time> SP <offutc>`. 213 It is also fast-import's default format, if \--date-format was 214 not specified. 215+ 216The time of the event is specified by `<time>` as the number of 217seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is 218written as an ASCII decimal integer. 219+ 220The local offset is specified by `<offutc>` as a positive or negative 221offset from UTC. For example EST (which is 5 hours behind UTC) 222would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. 223The local offset does not affect `<time>`; it is used only as an 224advisement to help formatting routines display the timestamp. 225+ 226If the local offset is not available in the source material, use 227``+0000'', or the most common local offset. For example many 228organizations have a CVS repository which has only ever been accessed 229by users who are located in the same location and timezone. In this 230case a reasonable offset from UTC could be assumed. 231+ 232Unlike the `rfc2822` format, this format is very strict. Any 233variation in formatting will cause fast-import to reject the value. 234 235`rfc2822`:: 236 This is the standard email format as described by RFC 2822. 237+ 238An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git 239parser is accurate, but a little on the lenient side. It is the 240same parser used by 'git am' when applying patches 241received from email. 242+ 243Some malformed strings may be accepted as valid dates. In some of 244these cases Git will still be able to obtain the correct date from 245the malformed string. There are also some types of malformed 246strings which Git will parse wrong, and yet consider valid. 247Seriously malformed strings will be rejected. 248+ 249Unlike the `raw` format above, the timezone/UTC offset information 250contained in an RFC 2822 date string is used to adjust the date 251value to UTC prior to storage. Therefore it is important that 252this information be as accurate as possible. 253+ 254If the source material uses RFC 2822 style dates, 255the frontend should let fast-import handle the parsing and conversion 256(rather than attempting to do it itself) as the Git parser has 257been well tested in the wild. 258+ 259Frontends should prefer the `raw` format if the source material 260already uses UNIX-epoch format, can be coaxed to give dates in that 261format, or its format is easily convertible to it, as there is no 262ambiguity in parsing. 263 264`now`:: 265 Always use the current time and timezone. The literal 266 `now` must always be supplied for `<when>`. 267+ 268This is a toy format. The current time and timezone of this system 269is always copied into the identity string at the time it is being 270created by fast-import. There is no way to specify a different time or 271timezone. 272+ 273This particular format is supplied as it's short to implement and 274may be useful to a process that wants to create a new commit 275right now, without needing to use a working directory or 276'git update-index'. 277+ 278If separate `author` and `committer` commands are used in a `commit` 279the timestamps may not match, as the system clock will be polled 280twice (once for each command). The only way to ensure that both 281author and committer identity information has the same timestamp 282is to omit `author` (thus copying from `committer`) or to use a 283date format other than `now`. 284 285Commands 286~~~~~~~~ 287fast-import accepts several commands to update the current repository 288and control the current import process. More detailed discussion 289(with examples) of each command follows later. 290 291`commit`:: 292 Creates a new branch or updates an existing branch by 293 creating a new commit and updating the branch to point at 294 the newly created commit. 295 296`tag`:: 297 Creates an annotated tag object from an existing commit or 298 branch. Lightweight tags are not supported by this command, 299 as they are not recommended for recording meaningful points 300 in time. 301 302`reset`:: 303 Reset an existing branch (or a new branch) to a specific 304 revision. This command must be used to change a branch to 305 a specific revision without making a commit on it. 306 307`blob`:: 308 Convert raw file data into a blob, for future use in a 309 `commit` command. This command is optional and is not 310 needed to perform an import. 311 312`checkpoint`:: 313 Forces fast-import to close the current packfile, generate its 314 unique SHA-1 checksum and index, and start a new packfile. 315 This command is optional and is not needed to perform 316 an import. 317 318`progress`:: 319 Causes fast-import to echo the entire line to its own 320 standard output. This command is optional and is not needed 321 to perform an import. 322 323`feature`:: 324 Require that fast-import supports the specified feature, or 325 abort if it does not. 326 327`option`:: 328 Specify any of the options listed under OPTIONS that do not 329 change stream semantic to suit the frontend's needs. This 330 command is optional and is not needed to perform an import. 331 332`commit` 333~~~~~~~~ 334Create or update a branch with a new commit, recording one logical 335change to the project. 336 337.... 338 'commit' SP <ref> LF 339 mark? 340 ('author' (SP <name>)? SP LT <email> GT SP <when> LF)? 341 'committer' (SP <name>)? SP LT <email> GT SP <when> LF 342 data 343 ('from' SP <committish> LF)? 344 ('merge' SP <committish> LF)? 345 (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* 346 LF? 347.... 348 349where `<ref>` is the name of the branch to make the commit on. 350Typically branch names are prefixed with `refs/heads/` in 351Git, so importing the CVS branch symbol `RELENG-1_0` would use 352`refs/heads/RELENG-1_0` for the value of `<ref>`. The value of 353`<ref>` must be a valid refname in Git. As `LF` is not valid in 354a Git refname, no quoting or escaping syntax is supported here. 355 356A `mark` command may optionally appear, requesting fast-import to save a 357reference to the newly created commit for future use by the frontend 358(see below for format). It is very common for frontends to mark 359every commit they create, thereby allowing future branch creation 360from any imported commit. 361 362The `data` command following `committer` must supply the commit 363message (see below for `data` command syntax). To import an empty 364commit message use a 0 length data. Commit messages are free-form 365and are not interpreted by Git. Currently they must be encoded in 366UTF-8, as fast-import does not permit other encodings to be specified. 367 368Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, 369`filedeleteall` and `notemodify` commands 370may be included to update the contents of the branch prior to 371creating the commit. These commands may be supplied in any order. 372However it is recommended that a `filedeleteall` command precede 373all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in 374the same commit, as `filedeleteall` wipes the branch clean (see below). 375 376The `LF` after the command is optional (it used to be required). 377 378`author` 379^^^^^^^^ 380An `author` command may optionally appear, if the author information 381might differ from the committer information. If `author` is omitted 382then fast-import will automatically use the committer's information for 383the author portion of the commit. See below for a description of 384the fields in `author`, as they are identical to `committer`. 385 386`committer` 387^^^^^^^^^^^ 388The `committer` command indicates who made this commit, and when 389they made it. 390 391Here `<name>` is the person's display name (for example 392``Com M Itter'') and `<email>` is the person's email address 393(``cm@example.com''). `LT` and `GT` are the literal less-than (\x3c) 394and greater-than (\x3e) symbols. These are required to delimit 395the email address from the other fields in the line. Note that 396`<name>` is free-form and may contain any sequence of bytes, except 397`LT` and `LF`. It is typically UTF-8 encoded. 398 399The time of the change is specified by `<when>` using the date format 400that was selected by the \--date-format=<fmt> command line option. 401See ``Date Formats'' above for the set of supported formats, and 402their syntax. 403 404`from` 405^^^^^^ 406The `from` command is used to specify the commit to initialize 407this branch from. This revision will be the first ancestor of the 408new commit. 409 410Omitting the `from` command in the first commit of a new branch 411will cause fast-import to create that commit with no ancestor. This 412tends to be desired only for the initial commit of a project. 413If the frontend creates all files from scratch when making a new 414branch, a `merge` command may be used instead of `from` to start 415the commit with an empty tree. 416Omitting the `from` command on existing branches is usually desired, 417as the current commit on that branch is automatically assumed to 418be the first ancestor of the new commit. 419 420As `LF` is not valid in a Git refname or SHA-1 expression, no 421quoting or escaping syntax is supported within `<committish>`. 422 423Here `<committish>` is any of the following: 424 425* The name of an existing branch already in fast-import's internal branch 426 table. If fast-import doesn't know the name, it's treated as a SHA-1 427 expression. 428 429* A mark reference, `:<idnum>`, where `<idnum>` is the mark number. 430+ 431The reason fast-import uses `:` to denote a mark reference is this character 432is not legal in a Git branch name. The leading `:` makes it easy 433to distinguish between the mark 42 (`:42`) and the branch 42 (`42` 434or `refs/heads/42`), or an abbreviated SHA-1 which happened to 435consist only of base-10 digits. 436+ 437Marks must be declared (via `mark`) before they can be used. 438 439* A complete 40 byte or abbreviated commit SHA-1 in hex. 440 441* Any valid Git SHA-1 expression that resolves to a commit. See 442 ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[1] for details. 443 444The special case of restarting an incremental import from the 445current branch value should be written as: 446---- 447 from refs/heads/branch^0 448---- 449The `{caret}0` suffix is necessary as fast-import does not permit a branch to 450start from itself, and the branch is created in memory before the 451`from` command is even read from the input. Adding `{caret}0` will force 452fast-import to resolve the commit through Git's revision parsing library, 453rather than its internal branch table, thereby loading in the 454existing value of the branch. 455 456`merge` 457^^^^^^^ 458Includes one additional ancestor commit. If the `from` command is 459omitted when creating a new branch, the first `merge` commit will be 460the first ancestor of the current commit, and the branch will start 461out with no files. An unlimited number of `merge` commands per 462commit are permitted by fast-import, thereby establishing an n-way merge. 463However Git's other tools never create commits with more than 15 464additional ancestors (forming a 16-way merge). For this reason 465it is suggested that frontends do not use more than 15 `merge` 466commands per commit; 16, if starting a new, empty branch. 467 468Here `<committish>` is any of the commit specification expressions 469also accepted by `from` (see above). 470 471`filemodify` 472^^^^^^^^^^^^ 473Included in a `commit` command to add a new file or change the 474content of an existing file. This command has two different means 475of specifying the content of the file. 476 477External data format:: 478 The data content for the file was already supplied by a prior 479 `blob` command. The frontend just needs to connect it. 480+ 481.... 482 'M' SP <mode> SP <dataref> SP <path> LF 483.... 484+ 485Here usually `<dataref>` must be either a mark reference (`:<idnum>`) 486set by a prior `blob` command, or a full 40-byte SHA-1 of an 487existing Git blob object. If `<mode>` is `040000`` then 488`<dataref>` must be the full 40-byte SHA-1 of an existing 489Git tree object or a mark reference set with `--import-marks`. 490 491Inline data format:: 492 The data content for the file has not been supplied yet. 493 The frontend wants to supply it as part of this modify 494 command. 495+ 496.... 497 'M' SP <mode> SP 'inline' SP <path> LF 498 data 499.... 500+ 501See below for a detailed description of the `data` command. 502 503In both formats `<mode>` is the type of file entry, specified 504in octal. Git only supports the following modes: 505 506* `100644` or `644`: A normal (not-executable) file. The majority 507 of files in most projects use this mode. If in doubt, this is 508 what you want. 509* `100755` or `755`: A normal, but executable, file. 510* `120000`: A symlink, the content of the file will be the link target. 511* `160000`: A gitlink, SHA-1 of the object refers to a commit in 512 another repository. Git links can only be specified by SHA or through 513 a commit mark. They are used to implement submodules. 514* `040000`: A subdirectory. Subdirectories can only be specified by 515 SHA or through a tree mark set with `--import-marks`. 516 517In both formats `<path>` is the complete path of the file to be added 518(if not already existing) or modified (if already existing). 519 520A `<path>` string must use UNIX-style directory separators (forward 521slash `/`), may contain any byte other than `LF`, and must not 522start with double quote (`"`). 523 524If an `LF` or double quote must be encoded into `<path>` shell-style 525quoting should be used, e.g. `"path/with\n and \" in it"`. 526 527Additionally, in `040000` mode, `<path>` may also be an empty string 528(`""`) to specify the root of the tree. 529 530The value of `<path>` must be in canonical form. That is it must not: 531 532* contain an empty directory component (e.g. `foo//bar` is invalid), 533* end with a directory separator (e.g. `foo/` is invalid), 534* start with a directory separator (e.g. `/foo` is invalid), 535* contain the special component `.` or `..` (e.g. `foo/./bar` and 536 `foo/../bar` are invalid). 537 538It is recommended that `<path>` always be encoded using UTF-8. 539 540`filedelete` 541^^^^^^^^^^^^ 542Included in a `commit` command to remove a file or recursively 543delete an entire directory from the branch. If the file or directory 544removal makes its parent directory empty, the parent directory will 545be automatically removed too. This cascades up the tree until the 546first non-empty directory or the root is reached. 547 548.... 549 'D' SP <path> LF 550.... 551 552here `<path>` is the complete path of the file or subdirectory to 553be removed from the branch. 554See `filemodify` above for a detailed description of `<path>`. 555 556`filecopy` 557^^^^^^^^^^^^ 558Recursively copies an existing file or subdirectory to a different 559location within the branch. The existing file or directory must 560exist. If the destination exists it will be completely replaced 561by the content copied from the source. 562 563.... 564 'C' SP <path> SP <path> LF 565.... 566 567here the first `<path>` is the source location and the second 568`<path>` is the destination. See `filemodify` above for a detailed 569description of what `<path>` may look like. To use a source path 570that contains SP the path must be quoted. 571 572A `filecopy` command takes effect immediately. Once the source 573location has been copied to the destination any future commands 574applied to the source location will not impact the destination of 575the copy. 576 577`filerename` 578^^^^^^^^^^^^ 579Renames an existing file or subdirectory to a different location 580within the branch. The existing file or directory must exist. If 581the destination exists it will be replaced by the source directory. 582 583.... 584 'R' SP <path> SP <path> LF 585.... 586 587here the first `<path>` is the source location and the second 588`<path>` is the destination. See `filemodify` above for a detailed 589description of what `<path>` may look like. To use a source path 590that contains SP the path must be quoted. 591 592A `filerename` command takes effect immediately. Once the source 593location has been renamed to the destination any future commands 594applied to the source location will create new files there and not 595impact the destination of the rename. 596 597Note that a `filerename` is the same as a `filecopy` followed by a 598`filedelete` of the source location. There is a slight performance 599advantage to using `filerename`, but the advantage is so small 600that it is never worth trying to convert a delete/add pair in 601source material into a rename for fast-import. This `filerename` 602command is provided just to simplify frontends that already have 603rename information and don't want bother with decomposing it into a 604`filecopy` followed by a `filedelete`. 605 606`filedeleteall` 607^^^^^^^^^^^^^^^ 608Included in a `commit` command to remove all files (and also all 609directories) from the branch. This command resets the internal 610branch structure to have no files in it, allowing the frontend 611to subsequently add all interesting files from scratch. 612 613.... 614 'deleteall' LF 615.... 616 617This command is extremely useful if the frontend does not know 618(or does not care to know) what files are currently on the branch, 619and therefore cannot generate the proper `filedelete` commands to 620update the content. 621 622Issuing a `filedeleteall` followed by the needed `filemodify` 623commands to set the correct content will produce the same results 624as sending only the needed `filemodify` and `filedelete` commands. 625The `filedeleteall` approach may however require fast-import to use slightly 626more memory per active branch (less than 1 MiB for even most large 627projects); so frontends that can easily obtain only the affected 628paths for a commit are encouraged to do so. 629 630`notemodify` 631^^^^^^^^^^^^ 632Included in a `commit` command to add a new note (annotating a given 633commit) or change the content of an existing note. This command has 634two different means of specifying the content of the note. 635 636External data format:: 637 The data content for the note was already supplied by a prior 638 `blob` command. The frontend just needs to connect it to the 639 commit that is to be annotated. 640+ 641.... 642 'N' SP <dataref> SP <committish> LF 643.... 644+ 645Here `<dataref>` can be either a mark reference (`:<idnum>`) 646set by a prior `blob` command, or a full 40-byte SHA-1 of an 647existing Git blob object. 648 649Inline data format:: 650 The data content for the note has not been supplied yet. 651 The frontend wants to supply it as part of this modify 652 command. 653+ 654.... 655 'N' SP 'inline' SP <committish> LF 656 data 657.... 658+ 659See below for a detailed description of the `data` command. 660 661In both formats `<committish>` is any of the commit specification 662expressions also accepted by `from` (see above). 663 664`mark` 665~~~~~~ 666Arranges for fast-import to save a reference to the current object, allowing 667the frontend to recall this object at a future point in time, without 668knowing its SHA-1. Here the current object is the object creation 669command the `mark` command appears within. This can be `commit`, 670`tag`, and `blob`, but `commit` is the most common usage. 671 672.... 673 'mark' SP ':' <idnum> LF 674.... 675 676where `<idnum>` is the number assigned by the frontend to this mark. 677The value of `<idnum>` is expressed as an ASCII decimal integer. 678The value 0 is reserved and cannot be used as 679a mark. Only values greater than or equal to 1 may be used as marks. 680 681New marks are created automatically. Existing marks can be moved 682to another object simply by reusing the same `<idnum>` in another 683`mark` command. 684 685`tag` 686~~~~~ 687Creates an annotated tag referring to a specific commit. To create 688lightweight (non-annotated) tags see the `reset` command below. 689 690.... 691 'tag' SP <name> LF 692 'from' SP <committish> LF 693 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF 694 data 695.... 696 697where `<name>` is the name of the tag to create. 698 699Tag names are automatically prefixed with `refs/tags/` when stored 700in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would 701use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the 702corresponding ref as `refs/tags/RELENG-1_0-FINAL`. 703 704The value of `<name>` must be a valid refname in Git and therefore 705may contain forward slashes. As `LF` is not valid in a Git refname, 706no quoting or escaping syntax is supported here. 707 708The `from` command is the same as in the `commit` command; see 709above for details. 710 711The `tagger` command uses the same format as `committer` within 712`commit`; again see above for details. 713 714The `data` command following `tagger` must supply the annotated tag 715message (see below for `data` command syntax). To import an empty 716tag message use a 0 length data. Tag messages are free-form and are 717not interpreted by Git. Currently they must be encoded in UTF-8, 718as fast-import does not permit other encodings to be specified. 719 720Signing annotated tags during import from within fast-import is not 721supported. Trying to include your own PGP/GPG signature is not 722recommended, as the frontend does not (easily) have access to the 723complete set of bytes which normally goes into such a signature. 724If signing is required, create lightweight tags from within fast-import with 725`reset`, then create the annotated versions of those tags offline 726with the standard 'git tag' process. 727 728`reset` 729~~~~~~~ 730Creates (or recreates) the named branch, optionally starting from 731a specific revision. The reset command allows a frontend to issue 732a new `from` command for an existing branch, or to create a new 733branch from an existing commit without creating a new commit. 734 735.... 736 'reset' SP <ref> LF 737 ('from' SP <committish> LF)? 738 LF? 739.... 740 741For a detailed description of `<ref>` and `<committish>` see above 742under `commit` and `from`. 743 744The `LF` after the command is optional (it used to be required). 745 746The `reset` command can also be used to create lightweight 747(non-annotated) tags. For example: 748 749==== 750 reset refs/tags/938 751 from :938 752==== 753 754would create the lightweight tag `refs/tags/938` referring to 755whatever commit mark `:938` references. 756 757`blob` 758~~~~~~ 759Requests writing one file revision to the packfile. The revision 760is not connected to any commit; this connection must be formed in 761a subsequent `commit` command by referencing the blob through an 762assigned mark. 763 764.... 765 'blob' LF 766 mark? 767 data 768.... 769 770The mark command is optional here as some frontends have chosen 771to generate the Git SHA-1 for the blob on their own, and feed that 772directly to `commit`. This is typically more work than it's worth 773however, as marks are inexpensive to store and easy to use. 774 775`data` 776~~~~~~ 777Supplies raw data (for use as blob/file content, commit messages, or 778annotated tag messages) to fast-import. Data can be supplied using an exact 779byte count or delimited with a terminating line. Real frontends 780intended for production-quality conversions should always use the 781exact byte count format, as it is more robust and performs better. 782The delimited format is intended primarily for testing fast-import. 783 784Comment lines appearing within the `<raw>` part of `data` commands 785are always taken to be part of the body of the data and are therefore 786never ignored by fast-import. This makes it safe to import any 787file/message content whose lines might start with `#`. 788 789Exact byte count format:: 790 The frontend must specify the number of bytes of data. 791+ 792.... 793 'data' SP <count> LF 794 <raw> LF? 795.... 796+ 797where `<count>` is the exact number of bytes appearing within 798`<raw>`. The value of `<count>` is expressed as an ASCII decimal 799integer. The `LF` on either side of `<raw>` is not 800included in `<count>` and will not be included in the imported data. 801+ 802The `LF` after `<raw>` is optional (it used to be required) but 803recommended. Always including it makes debugging a fast-import 804stream easier as the next command always starts in column 0 805of the next line, even if `<raw>` did not end with an `LF`. 806 807Delimited format:: 808 A delimiter string is used to mark the end of the data. 809 fast-import will compute the length by searching for the delimiter. 810 This format is primarily useful for testing and is not 811 recommended for real data. 812+ 813.... 814 'data' SP '<<' <delim> LF 815 <raw> LF 816 <delim> LF 817 LF? 818.... 819+ 820where `<delim>` is the chosen delimiter string. The string `<delim>` 821must not appear on a line by itself within `<raw>`, as otherwise 822fast-import will think the data ends earlier than it really does. The `LF` 823immediately trailing `<raw>` is part of `<raw>`. This is one of 824the limitations of the delimited format, it is impossible to supply 825a data chunk which does not have an LF as its last byte. 826+ 827The `LF` after `<delim> LF` is optional (it used to be required). 828 829`checkpoint` 830~~~~~~~~~~~~ 831Forces fast-import to close the current packfile, start a new one, and to 832save out all current branch refs, tags and marks. 833 834.... 835 'checkpoint' LF 836 LF? 837.... 838 839Note that fast-import automatically switches packfiles when the current 840packfile reaches \--max-pack-size, or 4 GiB, whichever limit is 841smaller. During an automatic packfile switch fast-import does not update 842the branch refs, tags or marks. 843 844As a `checkpoint` can require a significant amount of CPU time and 845disk IO (to compute the overall pack SHA-1 checksum, generate the 846corresponding index file, and update the refs) it can easily take 847several minutes for a single `checkpoint` command to complete. 848 849Frontends may choose to issue checkpoints during extremely large 850and long running imports, or when they need to allow another Git 851process access to a branch. However given that a 30 GiB Subversion 852repository can be loaded into Git through fast-import in about 3 hours, 853explicit checkpointing may not be necessary. 854 855The `LF` after the command is optional (it used to be required). 856 857`progress` 858~~~~~~~~~~ 859Causes fast-import to print the entire `progress` line unmodified to 860its standard output channel (file descriptor 1) when the command is 861processed from the input stream. The command otherwise has no impact 862on the current import, or on any of fast-import's internal state. 863 864.... 865 'progress' SP <any> LF 866 LF? 867.... 868 869The `<any>` part of the command may contain any sequence of bytes 870that does not contain `LF`. The `LF` after the command is optional. 871Callers may wish to process the output through a tool such as sed to 872remove the leading part of the line, for example: 873 874==== 875 frontend | git fast-import | sed 's/^progress //' 876==== 877 878Placing a `progress` command immediately after a `checkpoint` will 879inform the reader when the `checkpoint` has been completed and it 880can safely access the refs that fast-import updated. 881 882`feature` 883~~~~~~~~~ 884Require that fast-import supports the specified feature, or abort if 885it does not. 886 887.... 888 'feature' SP <feature> LF 889.... 890 891The <feature> part of the command may be any string matching 892^[a-zA-Z][a-zA-Z-]*$ and should be understood by fast-import. 893 894Feature work identical as their option counterparts with the 895exception of the import-marks feature, see below. 896 897The following features are currently supported: 898 899* date-format 900* import-marks 901* export-marks 902* relative-marks 903* no-relative-marks 904* force 905 906The import-marks behaves differently from when it is specified as 907commandline option in that only one "feature import-marks" is allowed 908per stream. Also, any --import-marks= specified on the commandline 909will override those from the stream (if any). 910 911`option` 912~~~~~~~~ 913Processes the specified option so that git fast-import behaves in a 914way that suits the frontend's needs. 915Note that options specified by the frontend are overridden by any 916options the user may specify to git fast-import itself. 917 918.... 919 'option' SP <option> LF 920.... 921 922The `<option>` part of the command may contain any of the options 923listed in the OPTIONS section that do not change import semantics, 924without the leading '--' and is treated in the same way. 925 926Option commands must be the first commands on the input (not counting 927feature commands), to give an option command after any non-option 928command is an error. 929 930The following commandline options change import semantics and may therefore 931not be passed as option: 932 933* date-format 934* import-marks 935* export-marks 936* force 937 938Crash Reports 939------------- 940If fast-import is supplied invalid input it will terminate with a 941non-zero exit status and create a crash report in the top level of 942the Git repository it was importing into. Crash reports contain 943a snapshot of the internal fast-import state as well as the most 944recent commands that lead up to the crash. 945 946All recent commands (including stream comments, file changes and 947progress commands) are shown in the command history within the crash 948report, but raw file data and commit messages are excluded from the 949crash report. This exclusion saves space within the report file 950and reduces the amount of buffering that fast-import must perform 951during execution. 952 953After writing a crash report fast-import will close the current 954packfile and export the marks table. This allows the frontend 955developer to inspect the repository state and resume the import from 956the point where it crashed. The modified branches and tags are not 957updated during a crash, as the import did not complete successfully. 958Branch and tag information can be found in the crash report and 959must be applied manually if the update is needed. 960 961An example crash: 962 963==== 964 $ cat >in <<END_OF_INPUT 965 # my very first test commit 966 commit refs/heads/master 967 committer Shawn O. Pearce <spearce> 19283 -0400 968 # who is that guy anyway? 969 data <<EOF 970 this is my commit 971 EOF 972 M 644 inline .gitignore 973 data <<EOF 974 .gitignore 975 EOF 976 M 777 inline bob 977 END_OF_INPUT 978 979 $ git fast-import <in 980 fatal: Corrupt mode: M 777 inline bob 981 fast-import: dumping crash report to .git/fast_import_crash_8434 982 983 $ cat .git/fast_import_crash_8434 984 fast-import crash report: 985 fast-import process: 8434 986 parent process : 1391 987 at Sat Sep 1 00:58:12 2007 988 989 fatal: Corrupt mode: M 777 inline bob 990 991 Most Recent Commands Before Crash 992 --------------------------------- 993 # my very first test commit 994 commit refs/heads/master 995 committer Shawn O. Pearce <spearce> 19283 -0400 996 # who is that guy anyway? 997 data <<EOF 998 M 644 inline .gitignore 999 data <<EOF1000 * M 777 inline bob10011002 Active Branch LRU1003 -----------------1004 active_branches = 1 cur, 5 max10051006 pos clock name1007 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~1008 1) 0 refs/heads/master10091010 Inactive Branches1011 -----------------1012 refs/heads/master:1013 status : active loaded dirty1014 tip commit : 00000000000000000000000000000000000000001015 old tree : 00000000000000000000000000000000000000001016 cur tree : 00000000000000000000000000000000000000001017 commit clock: 01018 last pack :101910201021 -------------------1022 END OF CRASH REPORT1023====10241025Tips and Tricks1026---------------1027The following tips and tricks have been collected from various1028users of fast-import, and are offered here as suggestions.10291030Use One Mark Per Commit1031~~~~~~~~~~~~~~~~~~~~~~~1032When doing a repository conversion, use a unique mark per commit1033(`mark :<n>`) and supply the \--export-marks option on the command1034line. fast-import will dump a file which lists every mark and the Git1035object SHA-1 that corresponds to it. If the frontend can tie1036the marks back to the source repository, it is easy to verify the1037accuracy and completeness of the import by comparing each Git1038commit to the corresponding source revision.10391040Coming from a system such as Perforce or Subversion this should be1041quite simple, as the fast-import mark can also be the Perforce changeset1042number or the Subversion revision number.10431044Freely Skip Around Branches1045~~~~~~~~~~~~~~~~~~~~~~~~~~~1046Don't bother trying to optimize the frontend to stick to one branch1047at a time during an import. Although doing so might be slightly1048faster for fast-import, it tends to increase the complexity of the frontend1049code considerably.10501051The branch LRU builtin to fast-import tends to behave very well, and the1052cost of activating an inactive branch is so low that bouncing around1053between branches has virtually no impact on import performance.10541055Handling Renames1056~~~~~~~~~~~~~~~~1057When importing a renamed file or directory, simply delete the old1058name(s) and modify the new name(s) during the corresponding commit.1059Git performs rename detection after-the-fact, rather than explicitly1060during a commit.10611062Use Tag Fixup Branches1063~~~~~~~~~~~~~~~~~~~~~~1064Some other SCM systems let the user create a tag from multiple1065files which are not from the same commit/changeset. Or to create1066tags which are a subset of the files available in the repository.10671068Importing these tags as-is in Git is impossible without making at1069least one commit which ``fixes up'' the files to match the content1070of the tag. Use fast-import's `reset` command to reset a dummy branch1071outside of your normal branch space to the base commit for the tag,1072then commit one or more file fixup commits, and finally tag the1073dummy branch.10741075For example since all normal branches are stored under `refs/heads/`1076name the tag fixup branch `TAG_FIXUP`. This way it is impossible for1077the fixup branch used by the importer to have namespace conflicts1078with real branches imported from the source (the name `TAG_FIXUP`1079is not `refs/heads/TAG_FIXUP`).10801081When committing fixups, consider using `merge` to connect the1082commit(s) which are supplying file revisions to the fixup branch.1083Doing so will allow tools such as 'git blame' to track1084through the real commit history and properly annotate the source1085files.10861087After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP`1088to remove the dummy branch.10891090Import Now, Repack Later1091~~~~~~~~~~~~~~~~~~~~~~~~1092As soon as fast-import completes the Git repository is completely valid1093and ready for use. Typically this takes only a very short time,1094even for considerably large projects (100,000+ commits).10951096However repacking the repository is necessary to improve data1097locality and access performance. It can also take hours on extremely1098large projects (especially if -f and a large \--window parameter is1099used). Since repacking is safe to run alongside readers and writers,1100run the repack in the background and let it finish when it finishes.1101There is no reason to wait to explore your new Git project!11021103If you choose to wait for the repack, don't try to run benchmarks1104or performance tests until repacking is completed. fast-import outputs1105suboptimal packfiles that are simply never seen in real use1106situations.11071108Repacking Historical Data1109~~~~~~~~~~~~~~~~~~~~~~~~~1110If you are repacking very old imported data (e.g. older than the1111last year), consider expending some extra CPU time and supplying1112\--window=50 (or higher) when you run 'git repack'.1113This will take longer, but will also produce a smaller packfile.1114You only need to expend the effort once, and everyone using your1115project will benefit from the smaller repository.11161117Include Some Progress Messages1118~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~1119Every once in a while have your frontend emit a `progress` message1120to fast-import. The contents of the messages are entirely free-form,1121so one suggestion would be to output the current month and year1122each time the current commit date moves into the next month.1123Your users will feel better knowing how much of the data stream1124has been processed.112511261127Packfile Optimization1128---------------------1129When packing a blob fast-import always attempts to deltify against the last1130blob written. Unless specifically arranged for by the frontend,1131this will probably not be a prior version of the same file, so the1132generated delta will not be the smallest possible. The resulting1133packfile will be compressed, but will not be optimal.11341135Frontends which have efficient access to all revisions of a1136single file (for example reading an RCS/CVS ,v file) can choose1137to supply all revisions of that file as a sequence of consecutive1138`blob` commands. This allows fast-import to deltify the different file1139revisions against each other, saving space in the final packfile.1140Marks can be used to later identify individual file revisions during1141a sequence of `commit` commands.11421143The packfile(s) created by fast-import do not encourage good disk access1144patterns. This is caused by fast-import writing the data in the order1145it is received on standard input, while Git typically organizes1146data within packfiles to make the most recent (current tip) data1147appear before historical data. Git also clusters commits together,1148speeding up revision traversal through better cache locality.11491150For this reason it is strongly recommended that users repack the1151repository with `git repack -a -d` after fast-import completes, allowing1152Git to reorganize the packfiles for faster data access. If blob1153deltas are suboptimal (see above) then also adding the `-f` option1154to force recomputation of all deltas can significantly reduce the1155final packfile size (30-50% smaller can be quite typical).115611571158Memory Utilization1159------------------1160There are a number of factors which affect how much memory fast-import1161requires to perform an import. Like critical sections of core1162Git, fast-import uses its own memory allocators to amortize any overheads1163associated with malloc. In practice fast-import tends to amortize any1164malloc overheads to 0, due to its use of large block allocations.11651166per object1167~~~~~~~~~~1168fast-import maintains an in-memory structure for every object written in1169this execution. On a 32 bit system the structure is 32 bytes,1170on a 64 bit system the structure is 40 bytes (due to the larger1171pointer sizes). Objects in the table are not deallocated until1172fast-import terminates. Importing 2 million objects on a 32 bit system1173will require approximately 64 MiB of memory.11741175The object table is actually a hashtable keyed on the object name1176(the unique SHA-1). This storage configuration allows fast-import to reuse1177an existing or already written object and avoid writing duplicates1178to the output packfile. Duplicate blobs are surprisingly common1179in an import, typically due to branch merges in the source.11801181per mark1182~~~~~~~~1183Marks are stored in a sparse array, using 1 pointer (4 bytes or 81184bytes, depending on pointer size) per mark. Although the array1185is sparse, frontends are still strongly encouraged to use marks1186between 1 and n, where n is the total number of marks required for1187this import.11881189per branch1190~~~~~~~~~~1191Branches are classified as active and inactive. The memory usage1192of the two classes is significantly different.11931194Inactive branches are stored in a structure which uses 96 or 1201195bytes (32 bit or 64 bit systems, respectively), plus the length of1196the branch name (typically under 200 bytes), per branch. fast-import will1197easily handle as many as 10,000 inactive branches in under 2 MiB1198of memory.11991200Active branches have the same overhead as inactive branches, but1201also contain copies of every tree that has been recently modified on1202that branch. If subtree `include` has not been modified since the1203branch became active, its contents will not be loaded into memory,1204but if subtree `src` has been modified by a commit since the branch1205became active, then its contents will be loaded in memory.12061207As active branches store metadata about the files contained on that1208branch, their in-memory storage size can grow to a considerable size1209(see below).12101211fast-import automatically moves active branches to inactive status based on1212a simple least-recently-used algorithm. The LRU chain is updated on1213each `commit` command. The maximum number of active branches can be1214increased or decreased on the command line with \--active-branches=.12151216per active tree1217~~~~~~~~~~~~~~~1218Trees (aka directories) use just 12 bytes of memory on top of the1219memory required for their entries (see ``per active file'' below).1220The cost of a tree is virtually 0, as its overhead amortizes out1221over the individual file entries.12221223per active file entry1224~~~~~~~~~~~~~~~~~~~~~1225Files (and pointers to subtrees) within active trees require 52 or 641226bytes (32/64 bit platforms) per entry. To conserve space, file and1227tree names are pooled in a common string table, allowing the filename1228``Makefile'' to use just 16 bytes (after including the string header1229overhead) no matter how many times it occurs within the project.12301231The active branch LRU, when coupled with the filename string pool1232and lazy loading of subtrees, allows fast-import to efficiently import1233projects with 2,000+ branches and 45,114+ files in a very limited1234memory footprint (less than 2.7 MiB per active branch).123512361237Author1238------1239Written by Shawn O. Pearce <spearce@spearce.org>.12401241Documentation1242--------------1243Documentation by Shawn O. Pearce <spearce@spearce.org>.12441245GIT1246---1247Part of the linkgit:git[1] suite