Documentation / git-fast-import.txton commit Merge branch 'jk/am-i-resolved-fix' into maint (5bbbd57)
   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).  Note
 426that for reasons of backward compatibility, if the commit ends with a
 427`data` command (i.e. it has has no `from`, `merge`, `filemodify`,
 428`filedelete`, `filecopy`, `filerename`, `filedeleteall` or
 429`notemodify` commands) then two `LF` commands may appear at the end of
 430the command instead of just one.
 431
 432`author`
 433^^^^^^^^
 434An `author` command may optionally appear, if the author information
 435might differ from the committer information.  If `author` is omitted
 436then fast-import will automatically use the committer's information for
 437the author portion of the commit.  See below for a description of
 438the fields in `author`, as they are identical to `committer`.
 439
 440`committer`
 441^^^^^^^^^^^
 442The `committer` command indicates who made this commit, and when
 443they made it.
 444
 445Here `<name>` is the person's display name (for example
 446``Com M Itter'') and `<email>` is the person's email address
 447(``\cm@example.com'').  `LT` and `GT` are the literal less-than (\x3c)
 448and greater-than (\x3e) symbols.  These are required to delimit
 449the email address from the other fields in the line.  Note that
 450`<name>` and `<email>` are free-form and may contain any sequence
 451of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded.
 452
 453The time of the change is specified by `<when>` using the date format
 454that was selected by the --date-format=<fmt> command-line option.
 455See ``Date Formats'' above for the set of supported formats, and
 456their syntax.
 457
 458`from`
 459^^^^^^
 460The `from` command is used to specify the commit to initialize
 461this branch from.  This revision will be the first ancestor of the
 462new commit.  The state of the tree built at this commit will begin
 463with the state at the `from` commit, and be altered by the content
 464modifications in this commit.
 465
 466Omitting the `from` command in the first commit of a new branch
 467will cause fast-import to create that commit with no ancestor. This
 468tends to be desired only for the initial commit of a project.
 469If the frontend creates all files from scratch when making a new
 470branch, a `merge` command may be used instead of `from` to start
 471the commit with an empty tree.
 472Omitting the `from` command on existing branches is usually desired,
 473as the current commit on that branch is automatically assumed to
 474be the first ancestor of the new commit.
 475
 476As `LF` is not valid in a Git refname or SHA-1 expression, no
 477quoting or escaping syntax is supported within `<commit-ish>`.
 478
 479Here `<commit-ish>` is any of the following:
 480
 481* The name of an existing branch already in fast-import's internal branch
 482  table.  If fast-import doesn't know the name, it's treated as a SHA-1
 483  expression.
 484
 485* A mark reference, `:<idnum>`, where `<idnum>` is the mark number.
 486+
 487The reason fast-import uses `:` to denote a mark reference is this character
 488is not legal in a Git branch name.  The leading `:` makes it easy
 489to distinguish between the mark 42 (`:42`) and the branch 42 (`42`
 490or `refs/heads/42`), or an abbreviated SHA-1 which happened to
 491consist only of base-10 digits.
 492+
 493Marks must be declared (via `mark`) before they can be used.
 494
 495* A complete 40 byte or abbreviated commit SHA-1 in hex.
 496
 497* Any valid Git SHA-1 expression that resolves to a commit.  See
 498  ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details.
 499
 500* The special null SHA-1 (40 zeros) specifies that the branch is to be
 501  removed.
 502
 503The special case of restarting an incremental import from the
 504current branch value should be written as:
 505----
 506        from refs/heads/branch^0
 507----
 508The `^0` suffix is necessary as fast-import does not permit a branch to
 509start from itself, and the branch is created in memory before the
 510`from` command is even read from the input.  Adding `^0` will force
 511fast-import to resolve the commit through Git's revision parsing library,
 512rather than its internal branch table, thereby loading in the
 513existing value of the branch.
 514
 515`merge`
 516^^^^^^^
 517Includes one additional ancestor commit.  The additional ancestry
 518link does not change the way the tree state is built at this commit.
 519If the `from` command is
 520omitted when creating a new branch, the first `merge` commit will be
 521the first ancestor of the current commit, and the branch will start
 522out with no files.  An unlimited number of `merge` commands per
 523commit are permitted by fast-import, thereby establishing an n-way merge.
 524
 525Here `<commit-ish>` is any of the commit specification expressions
 526also accepted by `from` (see above).
 527
 528`filemodify`
 529^^^^^^^^^^^^
 530Included in a `commit` command to add a new file or change the
 531content of an existing file.  This command has two different means
 532of specifying the content of the file.
 533
 534External data format::
 535        The data content for the file was already supplied by a prior
 536        `blob` command.  The frontend just needs to connect it.
 537+
 538....
 539        'M' SP <mode> SP <dataref> SP <path> LF
 540....
 541+
 542Here usually `<dataref>` must be either a mark reference (`:<idnum>`)
 543set by a prior `blob` command, or a full 40-byte SHA-1 of an
 544existing Git blob object.  If `<mode>` is `040000`` then
 545`<dataref>` must be the full 40-byte SHA-1 of an existing
 546Git tree object or a mark reference set with `--import-marks`.
 547
 548Inline data format::
 549        The data content for the file has not been supplied yet.
 550        The frontend wants to supply it as part of this modify
 551        command.
 552+
 553....
 554        'M' SP <mode> SP 'inline' SP <path> LF
 555        data
 556....
 557+
 558See below for a detailed description of the `data` command.
 559
 560In both formats `<mode>` is the type of file entry, specified
 561in octal.  Git only supports the following modes:
 562
 563* `100644` or `644`: A normal (not-executable) file.  The majority
 564  of files in most projects use this mode.  If in doubt, this is
 565  what you want.
 566* `100755` or `755`: A normal, but executable, file.
 567* `120000`: A symlink, the content of the file will be the link target.
 568* `160000`: A gitlink, SHA-1 of the object refers to a commit in
 569  another repository. Git links can only be specified by SHA or through
 570  a commit mark. They are used to implement submodules.
 571* `040000`: A subdirectory.  Subdirectories can only be specified by
 572  SHA or through a tree mark set with `--import-marks`.
 573
 574In both formats `<path>` is the complete path of the file to be added
 575(if not already existing) or modified (if already existing).
 576
 577A `<path>` string must use UNIX-style directory separators (forward
 578slash `/`), may contain any byte other than `LF`, and must not
 579start with double quote (`"`).
 580
 581A path can use C-style string quoting; this is accepted in all cases
 582and mandatory if the filename starts with double quote or contains
 583`LF`. In C-style quoting, the complete name should be surrounded with
 584double quotes, and any `LF`, backslash, or double quote characters
 585must be escaped by preceding them with a backslash (e.g.,
 586`"path/with\n, \\ and \" in it"`).
 587
 588The value of `<path>` must be in canonical form. That is it must not:
 589
 590* contain an empty directory component (e.g. `foo//bar` is invalid),
 591* end with a directory separator (e.g. `foo/` is invalid),
 592* start with a directory separator (e.g. `/foo` is invalid),
 593* contain the special component `.` or `..` (e.g. `foo/./bar` and
 594  `foo/../bar` are invalid).
 595
 596The root of the tree can be represented by an empty string as `<path>`.
 597
 598It is recommended that `<path>` always be encoded using UTF-8.
 599
 600`filedelete`
 601^^^^^^^^^^^^
 602Included in a `commit` command to remove a file or recursively
 603delete an entire directory from the branch.  If the file or directory
 604removal makes its parent directory empty, the parent directory will
 605be automatically removed too.  This cascades up the tree until the
 606first non-empty directory or the root is reached.
 607
 608....
 609        'D' SP <path> LF
 610....
 611
 612here `<path>` is the complete path of the file or subdirectory to
 613be removed from the branch.
 614See `filemodify` above for a detailed description of `<path>`.
 615
 616`filecopy`
 617^^^^^^^^^^
 618Recursively copies an existing file or subdirectory to a different
 619location within the branch.  The existing file or directory must
 620exist.  If the destination exists it will be completely replaced
 621by the content copied from the source.
 622
 623....
 624        'C' SP <path> SP <path> LF
 625....
 626
 627here the first `<path>` is the source location and the second
 628`<path>` is the destination.  See `filemodify` above for a detailed
 629description of what `<path>` may look like.  To use a source path
 630that contains SP the path must be quoted.
 631
 632A `filecopy` command takes effect immediately.  Once the source
 633location has been copied to the destination any future commands
 634applied to the source location will not impact the destination of
 635the copy.
 636
 637`filerename`
 638^^^^^^^^^^^^
 639Renames an existing file or subdirectory to a different location
 640within the branch.  The existing file or directory must exist. If
 641the destination exists it will be replaced by the source directory.
 642
 643....
 644        'R' SP <path> SP <path> LF
 645....
 646
 647here the first `<path>` is the source location and the second
 648`<path>` is the destination.  See `filemodify` above for a detailed
 649description of what `<path>` may look like.  To use a source path
 650that contains SP the path must be quoted.
 651
 652A `filerename` command takes effect immediately.  Once the source
 653location has been renamed to the destination any future commands
 654applied to the source location will create new files there and not
 655impact the destination of the rename.
 656
 657Note that a `filerename` is the same as a `filecopy` followed by a
 658`filedelete` of the source location.  There is a slight performance
 659advantage to using `filerename`, but the advantage is so small
 660that it is never worth trying to convert a delete/add pair in
 661source material into a rename for fast-import.  This `filerename`
 662command is provided just to simplify frontends that already have
 663rename information and don't want bother with decomposing it into a
 664`filecopy` followed by a `filedelete`.
 665
 666`filedeleteall`
 667^^^^^^^^^^^^^^^
 668Included in a `commit` command to remove all files (and also all
 669directories) from the branch.  This command resets the internal
 670branch structure to have no files in it, allowing the frontend
 671to subsequently add all interesting files from scratch.
 672
 673....
 674        'deleteall' LF
 675....
 676
 677This command is extremely useful if the frontend does not know
 678(or does not care to know) what files are currently on the branch,
 679and therefore cannot generate the proper `filedelete` commands to
 680update the content.
 681
 682Issuing a `filedeleteall` followed by the needed `filemodify`
 683commands to set the correct content will produce the same results
 684as sending only the needed `filemodify` and `filedelete` commands.
 685The `filedeleteall` approach may however require fast-import to use slightly
 686more memory per active branch (less than 1 MiB for even most large
 687projects); so frontends that can easily obtain only the affected
 688paths for a commit are encouraged to do so.
 689
 690`notemodify`
 691^^^^^^^^^^^^
 692Included in a `commit` `<notes_ref>` command to add a new note
 693annotating a `<commit-ish>` or change this annotation contents.
 694Internally it is similar to filemodify 100644 on `<commit-ish>`
 695path (maybe split into subdirectories). It's not advised to
 696use any other commands to write to the `<notes_ref>` tree except
 697`filedeleteall` to delete all existing notes in this tree.
 698This command has two different means of specifying the content
 699of the note.
 700
 701External data format::
 702        The data content for the note was already supplied by a prior
 703        `blob` command.  The frontend just needs to connect it to the
 704        commit that is to be annotated.
 705+
 706....
 707        'N' SP <dataref> SP <commit-ish> LF
 708....
 709+
 710Here `<dataref>` can be either a mark reference (`:<idnum>`)
 711set by a prior `blob` command, or a full 40-byte SHA-1 of an
 712existing Git blob object.
 713
 714Inline data format::
 715        The data content for the note has not been supplied yet.
 716        The frontend wants to supply it as part of this modify
 717        command.
 718+
 719....
 720        'N' SP 'inline' SP <commit-ish> LF
 721        data
 722....
 723+
 724See below for a detailed description of the `data` command.
 725
 726In both formats `<commit-ish>` is any of the commit specification
 727expressions also accepted by `from` (see above).
 728
 729`mark`
 730~~~~~~
 731Arranges for fast-import to save a reference to the current object, allowing
 732the frontend to recall this object at a future point in time, without
 733knowing its SHA-1.  Here the current object is the object creation
 734command the `mark` command appears within.  This can be `commit`,
 735`tag`, and `blob`, but `commit` is the most common usage.
 736
 737....
 738        'mark' SP ':' <idnum> LF
 739....
 740
 741where `<idnum>` is the number assigned by the frontend to this mark.
 742The value of `<idnum>` is expressed as an ASCII decimal integer.
 743The value 0 is reserved and cannot be used as
 744a mark.  Only values greater than or equal to 1 may be used as marks.
 745
 746New marks are created automatically.  Existing marks can be moved
 747to another object simply by reusing the same `<idnum>` in another
 748`mark` command.
 749
 750`original-oid`
 751~~~~~~~~~~~~~~
 752Provides the name of the object in the original source control system.
 753fast-import will simply ignore this directive, but filter processes
 754which operate on and modify the stream before feeding to fast-import
 755may have uses for this information
 756
 757....
 758        'original-oid' SP <object-identifier> LF
 759....
 760
 761where `<object-identifer>` is any string not containing LF.
 762
 763`tag`
 764~~~~~
 765Creates an annotated tag referring to a specific commit.  To create
 766lightweight (non-annotated) tags see the `reset` command below.
 767
 768....
 769        'tag' SP <name> LF
 770        'from' SP <commit-ish> LF
 771        original-oid?
 772        'tagger' (SP <name>)? SP LT <email> GT SP <when> LF
 773        data
 774....
 775
 776where `<name>` is the name of the tag to create.
 777
 778Tag names are automatically prefixed with `refs/tags/` when stored
 779in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would
 780use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the
 781corresponding ref as `refs/tags/RELENG-1_0-FINAL`.
 782
 783The value of `<name>` must be a valid refname in Git and therefore
 784may contain forward slashes.  As `LF` is not valid in a Git refname,
 785no quoting or escaping syntax is supported here.
 786
 787The `from` command is the same as in the `commit` command; see
 788above for details.
 789
 790The `tagger` command uses the same format as `committer` within
 791`commit`; again see above for details.
 792
 793The `data` command following `tagger` must supply the annotated tag
 794message (see below for `data` command syntax).  To import an empty
 795tag message use a 0 length data.  Tag messages are free-form and are
 796not interpreted by Git.  Currently they must be encoded in UTF-8,
 797as fast-import does not permit other encodings to be specified.
 798
 799Signing annotated tags during import from within fast-import is not
 800supported.  Trying to include your own PGP/GPG signature is not
 801recommended, as the frontend does not (easily) have access to the
 802complete set of bytes which normally goes into such a signature.
 803If signing is required, create lightweight tags from within fast-import with
 804`reset`, then create the annotated versions of those tags offline
 805with the standard 'git tag' process.
 806
 807`reset`
 808~~~~~~~
 809Creates (or recreates) the named branch, optionally starting from
 810a specific revision.  The reset command allows a frontend to issue
 811a new `from` command for an existing branch, or to create a new
 812branch from an existing commit without creating a new commit.
 813
 814....
 815        'reset' SP <ref> LF
 816        ('from' SP <commit-ish> LF)?
 817        LF?
 818....
 819
 820For a detailed description of `<ref>` and `<commit-ish>` see above
 821under `commit` and `from`.
 822
 823The `LF` after the command is optional (it used to be required).
 824
 825The `reset` command can also be used to create lightweight
 826(non-annotated) tags.  For example:
 827
 828====
 829        reset refs/tags/938
 830        from :938
 831====
 832
 833would create the lightweight tag `refs/tags/938` referring to
 834whatever commit mark `:938` references.
 835
 836`blob`
 837~~~~~~
 838Requests writing one file revision to the packfile.  The revision
 839is not connected to any commit; this connection must be formed in
 840a subsequent `commit` command by referencing the blob through an
 841assigned mark.
 842
 843....
 844        'blob' LF
 845        mark?
 846        original-oid?
 847        data
 848....
 849
 850The mark command is optional here as some frontends have chosen
 851to generate the Git SHA-1 for the blob on their own, and feed that
 852directly to `commit`.  This is typically more work than it's worth
 853however, as marks are inexpensive to store and easy to use.
 854
 855`data`
 856~~~~~~
 857Supplies raw data (for use as blob/file content, commit messages, or
 858annotated tag messages) to fast-import.  Data can be supplied using an exact
 859byte count or delimited with a terminating line.  Real frontends
 860intended for production-quality conversions should always use the
 861exact byte count format, as it is more robust and performs better.
 862The delimited format is intended primarily for testing fast-import.
 863
 864Comment lines appearing within the `<raw>` part of `data` commands
 865are always taken to be part of the body of the data and are therefore
 866never ignored by fast-import.  This makes it safe to import any
 867file/message content whose lines might start with `#`.
 868
 869Exact byte count format::
 870        The frontend must specify the number of bytes of data.
 871+
 872....
 873        'data' SP <count> LF
 874        <raw> LF?
 875....
 876+
 877where `<count>` is the exact number of bytes appearing within
 878`<raw>`.  The value of `<count>` is expressed as an ASCII decimal
 879integer.  The `LF` on either side of `<raw>` is not
 880included in `<count>` and will not be included in the imported data.
 881+
 882The `LF` after `<raw>` is optional (it used to be required) but
 883recommended.  Always including it makes debugging a fast-import
 884stream easier as the next command always starts in column 0
 885of the next line, even if `<raw>` did not end with an `LF`.
 886
 887Delimited format::
 888        A delimiter string is used to mark the end of the data.
 889        fast-import will compute the length by searching for the delimiter.
 890        This format is primarily useful for testing and is not
 891        recommended for real data.
 892+
 893....
 894        'data' SP '<<' <delim> LF
 895        <raw> LF
 896        <delim> LF
 897        LF?
 898....
 899+
 900where `<delim>` is the chosen delimiter string.  The string `<delim>`
 901must not appear on a line by itself within `<raw>`, as otherwise
 902fast-import will think the data ends earlier than it really does.  The `LF`
 903immediately trailing `<raw>` is part of `<raw>`.  This is one of
 904the limitations of the delimited format, it is impossible to supply
 905a data chunk which does not have an LF as its last byte.
 906+
 907The `LF` after `<delim> LF` is optional (it used to be required).
 908
 909`checkpoint`
 910~~~~~~~~~~~~
 911Forces fast-import to close the current packfile, start a new one, and to
 912save out all current branch refs, tags and marks.
 913
 914....
 915        'checkpoint' LF
 916        LF?
 917....
 918
 919Note that fast-import automatically switches packfiles when the current
 920packfile reaches --max-pack-size, or 4 GiB, whichever limit is
 921smaller.  During an automatic packfile switch fast-import does not update
 922the branch refs, tags or marks.
 923
 924As a `checkpoint` can require a significant amount of CPU time and
 925disk IO (to compute the overall pack SHA-1 checksum, generate the
 926corresponding index file, and update the refs) it can easily take
 927several minutes for a single `checkpoint` command to complete.
 928
 929Frontends may choose to issue checkpoints during extremely large
 930and long running imports, or when they need to allow another Git
 931process access to a branch.  However given that a 30 GiB Subversion
 932repository can be loaded into Git through fast-import in about 3 hours,
 933explicit checkpointing may not be necessary.
 934
 935The `LF` after the command is optional (it used to be required).
 936
 937`progress`
 938~~~~~~~~~~
 939Causes fast-import to print the entire `progress` line unmodified to
 940its standard output channel (file descriptor 1) when the command is
 941processed from the input stream.  The command otherwise has no impact
 942on the current import, or on any of fast-import's internal state.
 943
 944....
 945        'progress' SP <any> LF
 946        LF?
 947....
 948
 949The `<any>` part of the command may contain any sequence of bytes
 950that does not contain `LF`.  The `LF` after the command is optional.
 951Callers may wish to process the output through a tool such as sed to
 952remove the leading part of the line, for example:
 953
 954====
 955        frontend | git fast-import | sed 's/^progress //'
 956====
 957
 958Placing a `progress` command immediately after a `checkpoint` will
 959inform the reader when the `checkpoint` has been completed and it
 960can safely access the refs that fast-import updated.
 961
 962`get-mark`
 963~~~~~~~~~~
 964Causes fast-import to print the SHA-1 corresponding to a mark to
 965stdout or to the file descriptor previously arranged with the
 966`--cat-blob-fd` argument. The command otherwise has no impact on the
 967current import; its purpose is to retrieve SHA-1s that later commits
 968might want to refer to in their commit messages.
 969
 970....
 971        'get-mark' SP ':' <idnum> LF
 972....
 973
 974See ``Responses To Commands'' below for details about how to read
 975this output safely.
 976
 977`cat-blob`
 978~~~~~~~~~~
 979Causes fast-import to print a blob to a file descriptor previously
 980arranged with the `--cat-blob-fd` argument.  The command otherwise
 981has no impact on the current import; its main purpose is to
 982retrieve blobs that may be in fast-import's memory but not
 983accessible from the target repository.
 984
 985....
 986        'cat-blob' SP <dataref> LF
 987....
 988
 989The `<dataref>` can be either a mark reference (`:<idnum>`)
 990set previously or a full 40-byte SHA-1 of a Git blob, preexisting or
 991ready to be written.
 992
 993Output uses the same format as `git cat-file --batch`:
 994
 995====
 996        <sha1> SP 'blob' SP <size> LF
 997        <contents> LF
 998====
 999
1000This command can be used where a `filemodify` directive can appear,
1001allowing it to be used in the middle of a commit.  For a `filemodify`
1002using an inline directive, it can also appear right before the `data`
1003directive.
1004
1005See ``Responses To Commands'' below for details about how to read
1006this output safely.
1007
1008`ls`
1009~~~~
1010Prints information about the object at a path to a file descriptor
1011previously arranged with the `--cat-blob-fd` argument.  This allows
1012printing a blob from the active commit (with `cat-blob`) or copying a
1013blob or tree from a previous commit for use in the current one (with
1014`filemodify`).
1015
1016The `ls` command can also be used where a `filemodify` directive can
1017appear, allowing it to be used in the middle of a commit.
1018
1019Reading from the active commit::
1020        This form can only be used in the middle of a `commit`.
1021        The path names a directory entry within fast-import's
1022        active commit.  The path must be quoted in this case.
1023+
1024....
1025        'ls' SP <path> LF
1026....
1027
1028Reading from a named tree::
1029        The `<dataref>` can be a mark reference (`:<idnum>`) or the
1030        full 40-byte SHA-1 of a Git tag, commit, or tree object,
1031        preexisting or waiting to be written.
1032        The path is relative to the top level of the tree
1033        named by `<dataref>`.
1034+
1035....
1036        'ls' SP <dataref> SP <path> LF
1037....
1038
1039See `filemodify` above for a detailed description of `<path>`.
1040
1041Output uses the same format as `git ls-tree <tree> -- <path>`:
1042
1043====
1044        <mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF
1045====
1046
1047The <dataref> represents the blob, tree, or commit object at <path>
1048and can be used in later 'get-mark', 'cat-blob', 'filemodify', or
1049'ls' commands.
1050
1051If there is no file or subtree at that path, 'git fast-import' will
1052instead report
1053
1054====
1055        missing SP <path> LF
1056====
1057
1058See ``Responses To Commands'' below for details about how to read
1059this output safely.
1060
1061`feature`
1062~~~~~~~~~
1063Require that fast-import supports the specified feature, or abort if
1064it does not.
1065
1066....
1067        'feature' SP <feature> ('=' <argument>)? LF
1068....
1069
1070The <feature> part of the command may be any one of the following:
1071
1072date-format::
1073export-marks::
1074relative-marks::
1075no-relative-marks::
1076force::
1077        Act as though the corresponding command-line option with
1078        a leading `--` was passed on the command line
1079        (see OPTIONS, above).
1080
1081import-marks::
1082import-marks-if-exists::
1083        Like --import-marks except in two respects: first, only one
1084        "feature import-marks" or "feature import-marks-if-exists"
1085        command is allowed per stream; second, an --import-marks=
1086        or --import-marks-if-exists command-line option overrides
1087        any of these "feature" commands in the stream; third,
1088        "feature import-marks-if-exists" like a corresponding
1089        command-line option silently skips a nonexistent file.
1090
1091get-mark::
1092cat-blob::
1093ls::
1094        Require that the backend support the 'get-mark', 'cat-blob',
1095        or 'ls' command respectively.
1096        Versions of fast-import not supporting the specified command
1097        will exit with a message indicating so.
1098        This lets the import error out early with a clear message,
1099        rather than wasting time on the early part of an import
1100        before the unsupported command is detected.
1101
1102notes::
1103        Require that the backend support the 'notemodify' (N)
1104        subcommand to the 'commit' command.
1105        Versions of fast-import not supporting notes will exit
1106        with a message indicating so.
1107
1108done::
1109        Error out if the stream ends without a 'done' command.
1110        Without this feature, errors causing the frontend to end
1111        abruptly at a convenient point in the stream can go
1112        undetected.  This may occur, for example, if an import
1113        front end dies in mid-operation without emitting SIGTERM
1114        or SIGKILL at its subordinate git fast-import instance.
1115
1116`option`
1117~~~~~~~~
1118Processes the specified option so that git fast-import behaves in a
1119way that suits the frontend's needs.
1120Note that options specified by the frontend are overridden by any
1121options the user may specify to git fast-import itself.
1122
1123....
1124    'option' SP <option> LF
1125....
1126
1127The `<option>` part of the command may contain any of the options
1128listed in the OPTIONS section that do not change import semantics,
1129without the leading `--` and is treated in the same way.
1130
1131Option commands must be the first commands on the input (not counting
1132feature commands), to give an option command after any non-option
1133command is an error.
1134
1135The following command-line options change import semantics and may therefore
1136not be passed as option:
1137
1138* date-format
1139* import-marks
1140* export-marks
1141* cat-blob-fd
1142* force
1143
1144`done`
1145~~~~~~
1146If the `done` feature is not in use, treated as if EOF was read.
1147This can be used to tell fast-import to finish early.
1148
1149If the `--done` command-line option or `feature done` command is
1150in use, the `done` command is mandatory and marks the end of the
1151stream.
1152
1153RESPONSES TO COMMANDS
1154---------------------
1155New objects written by fast-import are not available immediately.
1156Most fast-import commands have no visible effect until the next
1157checkpoint (or completion).  The frontend can send commands to
1158fill fast-import's input pipe without worrying about how quickly
1159they will take effect, which improves performance by simplifying
1160scheduling.
1161
1162For some frontends, though, it is useful to be able to read back
1163data from the current repository as it is being updated (for
1164example when the source material describes objects in terms of
1165patches to be applied to previously imported objects).  This can
1166be accomplished by connecting the frontend and fast-import via
1167bidirectional pipes:
1168
1169====
1170        mkfifo fast-import-output
1171        frontend <fast-import-output |
1172        git fast-import >fast-import-output
1173====
1174
1175A frontend set up this way can use `progress`, `get-mark`, `ls`, and
1176`cat-blob` commands to read information from the import in progress.
1177
1178To avoid deadlock, such frontends must completely consume any
1179pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before
1180performing writes to fast-import that might block.
1181
1182CRASH REPORTS
1183-------------
1184If fast-import is supplied invalid input it will terminate with a
1185non-zero exit status and create a crash report in the top level of
1186the Git repository it was importing into.  Crash reports contain
1187a snapshot of the internal fast-import state as well as the most
1188recent commands that lead up to the crash.
1189
1190All recent commands (including stream comments, file changes and
1191progress commands) are shown in the command history within the crash
1192report, but raw file data and commit messages are excluded from the
1193crash report.  This exclusion saves space within the report file
1194and reduces the amount of buffering that fast-import must perform
1195during execution.
1196
1197After writing a crash report fast-import will close the current
1198packfile and export the marks table.  This allows the frontend
1199developer to inspect the repository state and resume the import from
1200the point where it crashed.  The modified branches and tags are not
1201updated during a crash, as the import did not complete successfully.
1202Branch and tag information can be found in the crash report and
1203must be applied manually if the update is needed.
1204
1205An example crash:
1206
1207====
1208        $ cat >in <<END_OF_INPUT
1209        # my very first test commit
1210        commit refs/heads/master
1211        committer Shawn O. Pearce <spearce> 19283 -0400
1212        # who is that guy anyway?
1213        data <<EOF
1214        this is my commit
1215        EOF
1216        M 644 inline .gitignore
1217        data <<EOF
1218        .gitignore
1219        EOF
1220        M 777 inline bob
1221        END_OF_INPUT
1222
1223        $ git fast-import <in
1224        fatal: Corrupt mode: M 777 inline bob
1225        fast-import: dumping crash report to .git/fast_import_crash_8434
1226
1227        $ cat .git/fast_import_crash_8434
1228        fast-import crash report:
1229            fast-import process: 8434
1230            parent process     : 1391
1231            at Sat Sep 1 00:58:12 2007
1232
1233        fatal: Corrupt mode: M 777 inline bob
1234
1235        Most Recent Commands Before Crash
1236        ---------------------------------
1237          # my very first test commit
1238          commit refs/heads/master
1239          committer Shawn O. Pearce <spearce> 19283 -0400
1240          # who is that guy anyway?
1241          data <<EOF
1242          M 644 inline .gitignore
1243          data <<EOF
1244        * M 777 inline bob
1245
1246        Active Branch LRU
1247        -----------------
1248            active_branches = 1 cur, 5 max
1249
1250          pos  clock name
1251          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1252           1)      0 refs/heads/master
1253
1254        Inactive Branches
1255        -----------------
1256        refs/heads/master:
1257          status      : active loaded dirty
1258          tip commit  : 0000000000000000000000000000000000000000
1259          old tree    : 0000000000000000000000000000000000000000
1260          cur tree    : 0000000000000000000000000000000000000000
1261          commit clock: 0
1262          last pack   :
1263
1264
1265        -------------------
1266        END OF CRASH REPORT
1267====
1268
1269TIPS AND TRICKS
1270---------------
1271The following tips and tricks have been collected from various
1272users of fast-import, and are offered here as suggestions.
1273
1274Use One Mark Per Commit
1275~~~~~~~~~~~~~~~~~~~~~~~
1276When doing a repository conversion, use a unique mark per commit
1277(`mark :<n>`) and supply the --export-marks option on the command
1278line.  fast-import will dump a file which lists every mark and the Git
1279object SHA-1 that corresponds to it.  If the frontend can tie
1280the marks back to the source repository, it is easy to verify the
1281accuracy and completeness of the import by comparing each Git
1282commit to the corresponding source revision.
1283
1284Coming from a system such as Perforce or Subversion this should be
1285quite simple, as the fast-import mark can also be the Perforce changeset
1286number or the Subversion revision number.
1287
1288Freely Skip Around Branches
1289~~~~~~~~~~~~~~~~~~~~~~~~~~~
1290Don't bother trying to optimize the frontend to stick to one branch
1291at a time during an import.  Although doing so might be slightly
1292faster for fast-import, it tends to increase the complexity of the frontend
1293code considerably.
1294
1295The branch LRU builtin to fast-import tends to behave very well, and the
1296cost of activating an inactive branch is so low that bouncing around
1297between branches has virtually no impact on import performance.
1298
1299Handling Renames
1300~~~~~~~~~~~~~~~~
1301When importing a renamed file or directory, simply delete the old
1302name(s) and modify the new name(s) during the corresponding commit.
1303Git performs rename detection after-the-fact, rather than explicitly
1304during a commit.
1305
1306Use Tag Fixup Branches
1307~~~~~~~~~~~~~~~~~~~~~~
1308Some other SCM systems let the user create a tag from multiple
1309files which are not from the same commit/changeset.  Or to create
1310tags which are a subset of the files available in the repository.
1311
1312Importing these tags as-is in Git is impossible without making at
1313least one commit which ``fixes up'' the files to match the content
1314of the tag.  Use fast-import's `reset` command to reset a dummy branch
1315outside of your normal branch space to the base commit for the tag,
1316then commit one or more file fixup commits, and finally tag the
1317dummy branch.
1318
1319For example since all normal branches are stored under `refs/heads/`
1320name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for
1321the fixup branch used by the importer to have namespace conflicts
1322with real branches imported from the source (the name `TAG_FIXUP`
1323is not `refs/heads/TAG_FIXUP`).
1324
1325When committing fixups, consider using `merge` to connect the
1326commit(s) which are supplying file revisions to the fixup branch.
1327Doing so will allow tools such as 'git blame' to track
1328through the real commit history and properly annotate the source
1329files.
1330
1331After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP`
1332to remove the dummy branch.
1333
1334Import Now, Repack Later
1335~~~~~~~~~~~~~~~~~~~~~~~~
1336As soon as fast-import completes the Git repository is completely valid
1337and ready for use.  Typically this takes only a very short time,
1338even for considerably large projects (100,000+ commits).
1339
1340However repacking the repository is necessary to improve data
1341locality and access performance.  It can also take hours on extremely
1342large projects (especially if -f and a large --window parameter is
1343used).  Since repacking is safe to run alongside readers and writers,
1344run the repack in the background and let it finish when it finishes.
1345There is no reason to wait to explore your new Git project!
1346
1347If you choose to wait for the repack, don't try to run benchmarks
1348or performance tests until repacking is completed.  fast-import outputs
1349suboptimal packfiles that are simply never seen in real use
1350situations.
1351
1352Repacking Historical Data
1353~~~~~~~~~~~~~~~~~~~~~~~~~
1354If you are repacking very old imported data (e.g. older than the
1355last year), consider expending some extra CPU time and supplying
1356--window=50 (or higher) when you run 'git repack'.
1357This will take longer, but will also produce a smaller packfile.
1358You only need to expend the effort once, and everyone using your
1359project will benefit from the smaller repository.
1360
1361Include Some Progress Messages
1362~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1363Every once in a while have your frontend emit a `progress` message
1364to fast-import.  The contents of the messages are entirely free-form,
1365so one suggestion would be to output the current month and year
1366each time the current commit date moves into the next month.
1367Your users will feel better knowing how much of the data stream
1368has been processed.
1369
1370
1371PACKFILE OPTIMIZATION
1372---------------------
1373When packing a blob fast-import always attempts to deltify against the last
1374blob written.  Unless specifically arranged for by the frontend,
1375this will probably not be a prior version of the same file, so the
1376generated delta will not be the smallest possible.  The resulting
1377packfile will be compressed, but will not be optimal.
1378
1379Frontends which have efficient access to all revisions of a
1380single file (for example reading an RCS/CVS ,v file) can choose
1381to supply all revisions of that file as a sequence of consecutive
1382`blob` commands.  This allows fast-import to deltify the different file
1383revisions against each other, saving space in the final packfile.
1384Marks can be used to later identify individual file revisions during
1385a sequence of `commit` commands.
1386
1387The packfile(s) created by fast-import do not encourage good disk access
1388patterns.  This is caused by fast-import writing the data in the order
1389it is received on standard input, while Git typically organizes
1390data within packfiles to make the most recent (current tip) data
1391appear before historical data.  Git also clusters commits together,
1392speeding up revision traversal through better cache locality.
1393
1394For this reason it is strongly recommended that users repack the
1395repository with `git repack -a -d` after fast-import completes, allowing
1396Git to reorganize the packfiles for faster data access.  If blob
1397deltas are suboptimal (see above) then also adding the `-f` option
1398to force recomputation of all deltas can significantly reduce the
1399final packfile size (30-50% smaller can be quite typical).
1400
1401Instead of running `git repack` you can also run `git gc
1402--aggressive`, which will also optimize other things after an import
1403(e.g. pack loose refs). As noted in the "AGGRESSIVE" section in
1404linkgit:git-gc[1] the `--aggressive` option will find new deltas with
1405the `-f` option to linkgit:git-repack[1]. For the reasons elaborated
1406on above using `--aggressive` after a fast-import is one of the few
1407cases where it's known to be worthwhile.
1408
1409MEMORY UTILIZATION
1410------------------
1411There are a number of factors which affect how much memory fast-import
1412requires to perform an import.  Like critical sections of core
1413Git, fast-import uses its own memory allocators to amortize any overheads
1414associated with malloc.  In practice fast-import tends to amortize any
1415malloc overheads to 0, due to its use of large block allocations.
1416
1417per object
1418~~~~~~~~~~
1419fast-import maintains an in-memory structure for every object written in
1420this execution.  On a 32 bit system the structure is 32 bytes,
1421on a 64 bit system the structure is 40 bytes (due to the larger
1422pointer sizes).  Objects in the table are not deallocated until
1423fast-import terminates.  Importing 2 million objects on a 32 bit system
1424will require approximately 64 MiB of memory.
1425
1426The object table is actually a hashtable keyed on the object name
1427(the unique SHA-1).  This storage configuration allows fast-import to reuse
1428an existing or already written object and avoid writing duplicates
1429to the output packfile.  Duplicate blobs are surprisingly common
1430in an import, typically due to branch merges in the source.
1431
1432per mark
1433~~~~~~~~
1434Marks are stored in a sparse array, using 1 pointer (4 bytes or 8
1435bytes, depending on pointer size) per mark.  Although the array
1436is sparse, frontends are still strongly encouraged to use marks
1437between 1 and n, where n is the total number of marks required for
1438this import.
1439
1440per branch
1441~~~~~~~~~~
1442Branches are classified as active and inactive.  The memory usage
1443of the two classes is significantly different.
1444
1445Inactive branches are stored in a structure which uses 96 or 120
1446bytes (32 bit or 64 bit systems, respectively), plus the length of
1447the branch name (typically under 200 bytes), per branch.  fast-import will
1448easily handle as many as 10,000 inactive branches in under 2 MiB
1449of memory.
1450
1451Active branches have the same overhead as inactive branches, but
1452also contain copies of every tree that has been recently modified on
1453that branch.  If subtree `include` has not been modified since the
1454branch became active, its contents will not be loaded into memory,
1455but if subtree `src` has been modified by a commit since the branch
1456became active, then its contents will be loaded in memory.
1457
1458As active branches store metadata about the files contained on that
1459branch, their in-memory storage size can grow to a considerable size
1460(see below).
1461
1462fast-import automatically moves active branches to inactive status based on
1463a simple least-recently-used algorithm.  The LRU chain is updated on
1464each `commit` command.  The maximum number of active branches can be
1465increased or decreased on the command line with --active-branches=.
1466
1467per active tree
1468~~~~~~~~~~~~~~~
1469Trees (aka directories) use just 12 bytes of memory on top of the
1470memory required for their entries (see ``per active file'' below).
1471The cost of a tree is virtually 0, as its overhead amortizes out
1472over the individual file entries.
1473
1474per active file entry
1475~~~~~~~~~~~~~~~~~~~~~
1476Files (and pointers to subtrees) within active trees require 52 or 64
1477bytes (32/64 bit platforms) per entry.  To conserve space, file and
1478tree names are pooled in a common string table, allowing the filename
1479``Makefile'' to use just 16 bytes (after including the string header
1480overhead) no matter how many times it occurs within the project.
1481
1482The active branch LRU, when coupled with the filename string pool
1483and lazy loading of subtrees, allows fast-import to efficiently import
1484projects with 2,000+ branches and 45,114+ files in a very limited
1485memory footprint (less than 2.7 MiB per active branch).
1486
1487SIGNALS
1488-------
1489Sending *SIGUSR1* to the 'git fast-import' process ends the current
1490packfile early, simulating a `checkpoint` command.  The impatient
1491operator can use this facility to peek at the objects and refs from an
1492import in progress, at the cost of some added running time and worse
1493compression.
1494
1495SEE ALSO
1496--------
1497linkgit:git-fast-export[1]
1498
1499GIT
1500---
1501Part of the linkgit:git[1] suite