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