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