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