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