git-fast-import.txt 48.8 KB
Newer Older
1 2 3 4 5
git-fast-import(1)
==================

NAME
----
6
git-fast-import - Backend for fast Git data importers
7 8 9 10


SYNOPSIS
--------
11
frontend | 'git fast-import' [options]
12 13 14 15 16 17

DESCRIPTION
-----------
This program is usually not what the end user wants to run directly.
Most end users want to use one of the existing frontend programs,
which parses a specific type of foreign source and feeds the contents
18
stored there to 'git fast-import'.
19

20
fast-import reads a mixed command/data stream from standard input and
21 22 23 24 25
writes one or more packfiles directly into the current repository.
When EOF is received on standard input, fast import writes out
updated branch and tag refs, fully updating the current repository
with the newly imported data.

26
The fast-import backend itself can import into an empty repository (one that
27
has already been initialized by 'git init') or incrementally
28 29 30 31 32 33 34
update an existing populated repository.  Whether or not incremental
imports are supported from a particular foreign source depends on
the frontend program in use.


OPTIONS
-------
35 36
--date-format=<fmt>::
	Specify the type of dates the frontend will supply to
37
	fast-import within `author`, `committer` and `tagger` commands.
38 39 40
	See ``Date Formats'' below for details about which formats
	are supported, and their syntax.

41 42 43 44 45
--force::
	Force updating modified existing branches, even if doing
	so would cause commits to be lost (as the new commit does
	not contain the old commit).

46
--max-pack-size=<n>::
47
	Maximum size of each output packfile.
48
	The default is unlimited.
49

50 51 52 53 54 55
--big-file-threshold=<n>::
	Maximum size of a blob that fast-import will attempt to
	create a delta for, expressed in bytes.  The default is 512m
	(512 MiB).  Some importers may wish to lower this on systems
	with constrained memory.

56 57 58 59 60 61 62 63 64 65 66 67
--depth=<n>::
	Maximum delta depth, for blob and tree deltification.
	Default is 10.

--active-branches=<n>::
	Maximum number of branches to maintain active at once.
	See ``Memory Utilization'' below for details.  Default is 5.

--export-marks=<file>::
	Dumps the internal marks table to <file> when complete.
	Marks are written one per line as `:markid SHA-1`.
	Frontends can use this file to validate imports after they
68 69 70 71 72 73 74 75 76 77 78 79
	have been completed, or to save the marks table across
	incremental runs.  As <file> is only opened and truncated
	at checkpoint (or completion) the same path can also be
	safely given to \--import-marks.

--import-marks=<file>::
	Before processing any input, load the marks specified in
	<file>.  The input file must exist, must be readable, and
	must use the same format as produced by \--export-marks.
	Multiple options may be supplied to import more than one
	set of marks.  If a mark is defined to different values,
	the last file wins.
80

81 82 83 84 85 86 87 88 89 90 91 92 93 94
--relative-marks::
	After specifying --relative-marks= the paths specified
	with --import-marks= and --export-marks= are relative
	to an internal directory in the current repository.
	In git-fast-import this means that the paths are relative
	to the .git/info/fast-import directory. However, other
	importers may use a different location.

--no-relative-marks::
	Negates a previous --relative-marks. Allows for combining
	relative and non-relative marks by interweaving
	--(no-)-relative-marks= with the --(import|export)-marks=
	options.

95 96 97 98 99
--cat-blob-fd=<fd>::
	Specify the file descriptor that will be written to
	when the `cat-blob` command is encountered in the stream.
	The default behaviour is to write to `stdout`.

100 101 102 103 104 105 106
--export-pack-edges=<file>::
	After creating a packfile, print a line of data to
	<file> listing the filename of the packfile and the last
	commit on each branch that was written to that packfile.
	This information may be useful after importing projects
	whose total object set exceeds the 4 GiB packfile limit,
	as these commits can be used as edge points during calls
107
	to 'git pack-objects'.
108

109
--quiet::
110
	Disable all non-fatal output, making fast-import silent when it
J
Jonathan Nieder 已提交
111
	is successful.  This option disables the output shown by
112 113 114
	\--stats.

--stats::
115
	Display some basic statistics about the objects fast-import has
116
	created, the packfiles they were stored into, and the
117
	memory used by fast-import during this run.  Showing this output
118 119 120
	is currently the default, but can be disabled with \--quiet.


121 122
Performance
-----------
123
The design of fast-import allows it to import large projects in a minimum
124
amount of memory usage and processing time.  Assuming the frontend
125
is able to keep up with fast-import and feed it a constant stream of data,
126 127 128 129 130
import times for projects holding 10+ years of history and containing
100,000+ individual commits are generally completed in just 1-2
hours on quite modest (~$2,000 USD) hardware.

Most bottlenecks appear to be in foreign source data access (the
131
source just cannot extract revisions fast enough) or disk IO (fast-import
132 133 134 135 136 137 138
writes as fast as the disk will take the data).  Imports will run
faster if the source data is stored on a different drive than the
destination Git repository (due to less IO contention).


Development Cost
----------------
139
A typical frontend for fast-import tends to weigh in at approximately 200
140 141
lines of Perl/Python/Ruby code.  Most developers have been able to
create working importers in just a couple of hours, even though it
142
is their first exposure to fast-import, and sometimes even to Git.  This is
143 144 145 146 147 148
an ideal situation, given that most conversion tools are throw-away
(use once, and never look back).


Parallel Operation
------------------
149
Like 'git push' or 'git fetch', imports handled by fast-import are safe to
150
run alongside parallel `git repack -a -d` or `git gc` invocations,
151
or any other Git operation (including 'git prune', as loose objects
152
are never used by fast-import).
153

154 155
fast-import does not lock the branch or tag refs it is actively importing.
After the import, during its ref update phase, fast-import tests each
156 157 158
existing branch ref to verify the update will be a fast-forward
update (the commit stored in the ref is contained in the new
history of the commit to be written).  If the update is not a
159 160
fast-forward update, fast-import will skip updating that ref and instead
prints a warning message.  fast-import will always attempt to update all
161 162
branch refs, and does not stop on the first failure.

163
Branch updates can be forced with \--force, but it's recommended that
164
this only be used on an otherwise quiet repository.  Using \--force
165
is not necessary for an initial import into an empty repository.
166 167 168 169


Technical Discussion
--------------------
170
fast-import tracks a set of branches in memory.  Any branch can be created
171 172 173 174 175 176
or modified at any point during the import process by sending a
`commit` command on the input stream.  This design allows a frontend
program to process an unlimited number of branches simultaneously,
generating commits in the order they are available from the source
data.  It also simplifies the frontend programs considerably.

177
fast-import does not use or alter the current working directory, or any
178 179 180 181
file within it.  (It does however update the current Git repository,
as referenced by `GIT_DIR`.)  Therefore an import frontend may use
the working directory for its own purposes, such as extracting file
revisions from the foreign source.  This ignorance of the working
182
directory also allows fast-import to run very quickly, as it does not
183 184 185 186 187 188
need to perform any costly file update operations when switching
between branches.

Input Format
------------
With the exception of raw file data (which Git does not interpret)
189
the fast-import input format is text (ASCII) based.  This text based
190 191 192 193
format simplifies development and debugging of frontend programs,
especially when a higher level language such as Perl, Python or
Ruby is being used.

194
fast-import is very strict about its input.  Where we say SP below we mean
195 196 197
*exactly* one space.  Likewise LF means one (and only one) linefeed.
Supplying additional whitespace characters will cause unexpected
results, such as branch names or file names with leading or trailing
198
spaces in their name, or early termination of fast-import when it encounters
199 200
unexpected input.

201 202 203 204 205 206 207 208 209
Stream Comments
~~~~~~~~~~~~~~~
To aid in debugging frontends fast-import ignores any line that
begins with `#` (ASCII pound/hash) up to and including the line
ending `LF`.  A comment line may contain any sequence of bytes
that does not contain an LF and therefore may be used to include
any detailed debugging information that might be specific to the
frontend and useful when inspecting a fast-import data stream.

210 211 212 213
Date Formats
~~~~~~~~~~~~
The following date formats are supported.  A frontend should select
the format it will use for this import by passing the format name
214
in the \--date-format=<fmt> command line option.
215 216

`raw`::
217
	This is the Git native format and is `<time> SP <offutc>`.
218
	It is also fast-import's default format, if \--date-format was
219 220 221 222 223 224
	not specified.
+
The time of the event is specified by `<time>` as the number of
seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is
written as an ASCII decimal integer.
+
225 226 227 228 229
The local offset is specified by `<offutc>` as a positive or negative
offset from UTC.  For example EST (which is 5 hours behind UTC)
would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''.
The local offset does not affect `<time>`; it is used only as an
advisement to help formatting routines display the timestamp.
230
+
231 232
If the local offset is not available in the source material, use
``+0000'', or the most common local offset.  For example many
233 234
organizations have a CVS repository which has only ever been accessed
by users who are located in the same location and timezone.  In this
235
case a reasonable offset from UTC could be assumed.
236 237
+
Unlike the `rfc2822` format, this format is very strict.  Any
238
variation in formatting will cause fast-import to reject the value.
239 240 241 242 243

`rfc2822`::
	This is the standard email format as described by RFC 2822.
+
An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git
244
parser is accurate, but a little on the lenient side.  It is the
245
same parser used by 'git am' when applying patches
246 247 248 249 250 251 252 253
received from email.
+
Some malformed strings may be accepted as valid dates.  In some of
these cases Git will still be able to obtain the correct date from
the malformed string.  There are also some types of malformed
strings which Git will parse wrong, and yet consider valid.
Seriously malformed strings will be rejected.
+
254 255 256 257 258
Unlike the `raw` format above, the timezone/UTC offset information
contained in an RFC 2822 date string is used to adjust the date
value to UTC prior to storage.  Therefore it is important that
this information be as accurate as possible.
+
259
If the source material uses RFC 2822 style dates,
260
the frontend should let fast-import handle the parsing and conversion
261 262 263 264
(rather than attempting to do it itself) as the Git parser has
been well tested in the wild.
+
Frontends should prefer the `raw` format if the source material
265
already uses UNIX-epoch format, can be coaxed to give dates in that
266
format, or its format is easily convertible to it, as there is no
267
ambiguity in parsing.
268 269 270 271 272 273 274

`now`::
	Always use the current time and timezone.  The literal
	`now` must always be supplied for `<when>`.
+
This is a toy format.  The current time and timezone of this system
is always copied into the identity string at the time it is being
275
created by fast-import.  There is no way to specify a different time or
276 277
timezone.
+
278
This particular format is supplied as it's short to implement and
279 280
may be useful to a process that wants to create a new commit
right now, without needing to use a working directory or
281
'git update-index'.
282 283 284 285 286 287 288 289
+
If separate `author` and `committer` commands are used in a `commit`
the timestamps may not match, as the system clock will be polled
twice (once for each command).  The only way to ensure that both
author and committer identity information has the same timestamp
is to omit `author` (thus copying from `committer`) or to use a
date format other than `now`.

290 291
Commands
~~~~~~~~
292
fast-import accepts several commands to update the current repository
293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317
and control the current import process.  More detailed discussion
(with examples) of each command follows later.

`commit`::
	Creates a new branch or updates an existing branch by
	creating a new commit and updating the branch to point at
	the newly created commit.

`tag`::
	Creates an annotated tag object from an existing commit or
	branch.  Lightweight tags are not supported by this command,
	as they are not recommended for recording meaningful points
	in time.

`reset`::
	Reset an existing branch (or a new branch) to a specific
	revision.  This command must be used to change a branch to
	a specific revision without making a commit on it.

`blob`::
	Convert raw file data into a blob, for future use in a
	`commit` command.  This command is optional and is not
	needed to perform an import.

`checkpoint`::
318
	Forces fast-import to close the current packfile, generate its
319 320 321 322
	unique SHA-1 checksum and index, and start a new packfile.
	This command is optional and is not needed to perform
	an import.

323 324 325 326 327
`progress`::
	Causes fast-import to echo the entire line to its own
	standard output.  This command is optional and is not needed
	to perform an import.

328 329 330 331 332
`cat-blob`::
	Causes fast-import to print a blob in 'cat-file --batch'
	format to the file descriptor set with `--cat-blob-fd` or
	`stdout` if unspecified.

333 334 335 336
`feature`::
	Require that fast-import supports the specified feature, or
	abort if it does not.

S
Sverre Rabbelier 已提交
337 338 339 340 341
`option`::
	Specify any of the options listed under OPTIONS that do not
	change stream semantic to suit the frontend's needs. This
	command is optional and is not needed to perform an import.

342 343 344 345 346 347 348 349
`commit`
~~~~~~~~
Create or update a branch with a new commit, recording one logical
change to the project.

....
	'commit' SP <ref> LF
	mark?
350 351
	('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
	'committer' (SP <name>)? SP LT <email> GT SP <when> LF
352 353 354
	data
	('from' SP <committish> LF)?
	('merge' SP <committish> LF)?
355
	(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
356
	LF?
357 358 359 360 361 362 363 364 365
....

where `<ref>` is the name of the branch to make the commit on.
Typically branch names are prefixed with `refs/heads/` in
Git, so importing the CVS branch symbol `RELENG-1_0` would use
`refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of
`<ref>` must be a valid refname in Git.  As `LF` is not valid in
a Git refname, no quoting or escaping syntax is supported here.

366
A `mark` command may optionally appear, requesting fast-import to save a
367 368 369 370 371 372 373 374 375
reference to the newly created commit for future use by the frontend
(see below for format).  It is very common for frontends to mark
every commit they create, thereby allowing future branch creation
from any imported commit.

The `data` command following `committer` must supply the commit
message (see below for `data` command syntax).  To import an empty
commit message use a 0 length data.  Commit messages are free-form
and are not interpreted by Git.  Currently they must be encoded in
376
UTF-8, as fast-import does not permit other encodings to be specified.
377

378 379
Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`,
`filedeleteall` and `notemodify` commands
380 381
may be included to update the contents of the branch prior to
creating the commit.  These commands may be supplied in any order.
382
However it is recommended that a `filedeleteall` command precede
383 384
all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in
the same commit, as `filedeleteall` wipes the branch clean (see below).
385

386 387
The `LF` after the command is optional (it used to be required).

388 389 390 391
`author`
^^^^^^^^
An `author` command may optionally appear, if the author information
might differ from the committer information.  If `author` is omitted
392
then fast-import will automatically use the committer's information for
393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408
the author portion of the commit.  See below for a description of
the fields in `author`, as they are identical to `committer`.

`committer`
^^^^^^^^^^^
The `committer` command indicates who made this commit, and when
they made it.

Here `<name>` is the person's display name (for example
``Com M Itter'') and `<email>` is the person's email address
(``cm@example.com'').  `LT` and `GT` are the literal less-than (\x3c)
and greater-than (\x3e) symbols.  These are required to delimit
the email address from the other fields in the line.  Note that
`<name>` is free-form and may contain any sequence of bytes, except
`LT` and `LF`.  It is typically UTF-8 encoded.

409
The time of the change is specified by `<when>` using the date format
410
that was selected by the \--date-format=<fmt> command line option.
411 412
See ``Date Formats'' above for the set of supported formats, and
their syntax.
413 414 415

`from`
^^^^^^
416 417 418 419 420 421 422
The `from` command is used to specify the commit to initialize
this branch from.  This revision will be the first ancestor of the
new commit.

Omitting the `from` command in the first commit of a new branch
will cause fast-import to create that commit with no ancestor. This
tends to be desired only for the initial commit of a project.
423 424 425
If the frontend creates all files from scratch when making a new
branch, a `merge` command may be used instead of `from` to start
the commit with an empty tree.
426 427 428
Omitting the `from` command on existing branches is usually desired,
as the current commit on that branch is automatically assumed to
be the first ancestor of the new commit.
429 430 431 432 433 434

As `LF` is not valid in a Git refname or SHA-1 expression, no
quoting or escaping syntax is supported within `<committish>`.

Here `<committish>` is any of the following:

435
* The name of an existing branch already in fast-import's internal branch
436
  table.  If fast-import doesn't know the name, it's treated as a SHA-1
437 438 439 440
  expression.

* A mark reference, `:<idnum>`, where `<idnum>` is the mark number.
+
441
The reason fast-import uses `:` to denote a mark reference is this character
442
is not legal in a Git branch name.  The leading `:` makes it easy
443
to distinguish between the mark 42 (`:42`) and the branch 42 (`42`
444 445 446 447 448 449 450 451
or `refs/heads/42`), or an abbreviated SHA-1 which happened to
consist only of base-10 digits.
+
Marks must be declared (via `mark`) before they can be used.

* A complete 40 byte or abbreviated commit SHA-1 in hex.

* Any valid Git SHA-1 expression that resolves to a commit.  See
452
  ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details.
453 454 455 456 457 458

The special case of restarting an incremental import from the
current branch value should be written as:
----
	from refs/heads/branch^0
----
459
The `{caret}0` suffix is necessary as fast-import does not permit a branch to
460
start from itself, and the branch is created in memory before the
461
`from` command is even read from the input.  Adding `{caret}0` will force
462
fast-import to resolve the commit through Git's revision parsing library,
463 464 465 466 467
rather than its internal branch table, thereby loading in the
existing value of the branch.

`merge`
^^^^^^^
468 469 470 471
Includes one additional ancestor commit.  If the `from` command is
omitted when creating a new branch, the first `merge` commit will be
the first ancestor of the current commit, and the branch will start
out with no files.  An unlimited number of `merge` commands per
472
commit are permitted by fast-import, thereby establishing an n-way merge.
473 474 475
However Git's other tools never create commits with more than 15
additional ancestors (forming a 16-way merge).  For this reason
it is suggested that frontends do not use more than 15 `merge`
476
commands per commit; 16, if starting a new, empty branch.
477 478 479 480 481

Here `<committish>` is any of the commit specification expressions
also accepted by `from` (see above).

`filemodify`
482
^^^^^^^^^^^^
483 484 485 486 487 488 489 490 491 492 493 494
Included in a `commit` command to add a new file or change the
content of an existing file.  This command has two different means
of specifying the content of the file.

External data format::
	The data content for the file was already supplied by a prior
	`blob` command.  The frontend just needs to connect it.
+
....
	'M' SP <mode> SP <dataref> SP <path> LF
....
+
495
Here usually `<dataref>` must be either a mark reference (`:<idnum>`)
496
set by a prior `blob` command, or a full 40-byte SHA-1 of an
497 498 499
existing Git blob object.  If `<mode>` is `040000`` then
`<dataref>` must be the full 40-byte SHA-1 of an existing
Git tree object or a mark reference set with `--import-marks`.
500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519

Inline data format::
	The data content for the file has not been supplied yet.
	The frontend wants to supply it as part of this modify
	command.
+
....
	'M' SP <mode> SP 'inline' SP <path> LF
	data
....
+
See below for a detailed description of the `data` command.

In both formats `<mode>` is the type of file entry, specified
in octal.  Git only supports the following modes:

* `100644` or `644`: A normal (not-executable) file.  The majority
  of files in most projects use this mode.  If in doubt, this is
  what you want.
* `100755` or `755`: A normal, but executable, file.
J
Junio C Hamano 已提交
520
* `120000`: A symlink, the content of the file will be the link target.
521 522 523
* `160000`: A gitlink, SHA-1 of the object refers to a commit in
  another repository. Git links can only be specified by SHA or through
  a commit mark. They are used to implement submodules.
524 525
* `040000`: A subdirectory.  Subdirectories can only be specified by
  SHA or through a tree mark set with `--import-marks`.
526 527 528 529

In both formats `<path>` is the complete path of the file to be added
(if not already existing) or modified (if already existing).

530
A `<path>` string must use UNIX-style directory separators (forward
531 532 533 534 535 536
slash `/`), may contain any byte other than `LF`, and must not
start with double quote (`"`).

If an `LF` or double quote must be encoded into `<path>` shell-style
quoting should be used, e.g. `"path/with\n and \" in it"`.

537
The value of `<path>` must be in canonical form. That is it must not:
538 539

* contain an empty directory component (e.g. `foo//bar` is invalid),
540 541
* end with a directory separator (e.g. `foo/` is invalid),
* start with a directory separator (e.g. `/foo` is invalid),
542 543 544
* contain the special component `.` or `..` (e.g. `foo/./bar` and
  `foo/../bar` are invalid).

545 546
The root of the tree can be represented by an empty string as `<path>`.

547 548 549
It is recommended that `<path>` always be encoded using UTF-8.

`filedelete`
550
^^^^^^^^^^^^
551 552 553
Included in a `commit` command to remove a file or recursively
delete an entire directory from the branch.  If the file or directory
removal makes its parent directory empty, the parent directory will
554 555 556 557 558 559 560
be automatically removed too.  This cascades up the tree until the
first non-empty directory or the root is reached.

....
	'D' SP <path> LF
....

561 562
here `<path>` is the complete path of the file or subdirectory to
be removed from the branch.
563 564
See `filemodify` above for a detailed description of `<path>`.

565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585
`filecopy`
^^^^^^^^^^^^
Recursively copies an existing file or subdirectory to a different
location within the branch.  The existing file or directory must
exist.  If the destination exists it will be completely replaced
by the content copied from the source.

....
	'C' SP <path> SP <path> LF
....

here the first `<path>` is the source location and the second
`<path>` is the destination.  See `filemodify` above for a detailed
description of what `<path>` may look like.  To use a source path
that contains SP the path must be quoted.

A `filecopy` command takes effect immediately.  Once the source
location has been copied to the destination any future commands
applied to the source location will not impact the destination of
the copy.

586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605
`filerename`
^^^^^^^^^^^^
Renames an existing file or subdirectory to a different location
within the branch.  The existing file or directory must exist. If
the destination exists it will be replaced by the source directory.

....
	'R' SP <path> SP <path> LF
....

here the first `<path>` is the source location and the second
`<path>` is the destination.  See `filemodify` above for a detailed
description of what `<path>` may look like.  To use a source path
that contains SP the path must be quoted.

A `filerename` command takes effect immediately.  Once the source
location has been renamed to the destination any future commands
applied to the source location will create new files there and not
impact the destination of the rename.

606 607 608 609 610 611 612 613 614
Note that a `filerename` is the same as a `filecopy` followed by a
`filedelete` of the source location.  There is a slight performance
advantage to using `filerename`, but the advantage is so small
that it is never worth trying to convert a delete/add pair in
source material into a rename for fast-import.  This `filerename`
command is provided just to simplify frontends that already have
rename information and don't want bother with decomposing it into a
`filecopy` followed by a `filedelete`.

615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633
`filedeleteall`
^^^^^^^^^^^^^^^
Included in a `commit` command to remove all files (and also all
directories) from the branch.  This command resets the internal
branch structure to have no files in it, allowing the frontend
to subsequently add all interesting files from scratch.

....
	'deleteall' LF
....

This command is extremely useful if the frontend does not know
(or does not care to know) what files are currently on the branch,
and therefore cannot generate the proper `filedelete` commands to
update the content.

Issuing a `filedeleteall` followed by the needed `filemodify`
commands to set the correct content will produce the same results
as sending only the needed `filemodify` and `filedelete` commands.
634
The `filedeleteall` approach may however require fast-import to use slightly
635 636 637 638
more memory per active branch (less than 1 MiB for even most large
projects); so frontends that can easily obtain only the affected
paths for a commit are encouraged to do so.

639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672
`notemodify`
^^^^^^^^^^^^
Included in a `commit` command to add a new note (annotating a given
commit) or change the content of an existing note.  This command has
two different means of specifying the content of the note.

External data format::
	The data content for the note was already supplied by a prior
	`blob` command.  The frontend just needs to connect it to the
	commit that is to be annotated.
+
....
	'N' SP <dataref> SP <committish> LF
....
+
Here `<dataref>` can be either a mark reference (`:<idnum>`)
set by a prior `blob` command, or a full 40-byte SHA-1 of an
existing Git blob object.

Inline data format::
	The data content for the note has not been supplied yet.
	The frontend wants to supply it as part of this modify
	command.
+
....
	'N' SP 'inline' SP <committish> LF
	data
....
+
See below for a detailed description of the `data` command.

In both formats `<committish>` is any of the commit specification
expressions also accepted by `from` (see above).

673 674
`mark`
~~~~~~
675
Arranges for fast-import to save a reference to the current object, allowing
676 677 678 679 680 681 682 683 684 685
the frontend to recall this object at a future point in time, without
knowing its SHA-1.  Here the current object is the object creation
command the `mark` command appears within.  This can be `commit`,
`tag`, and `blob`, but `commit` is the most common usage.

....
	'mark' SP ':' <idnum> LF
....

where `<idnum>` is the number assigned by the frontend to this mark.
686 687
The value of `<idnum>` is expressed as an ASCII decimal integer.
The value 0 is reserved and cannot be used as
688 689 690 691 692 693 694 695 696 697 698 699 700 701
a mark.  Only values greater than or equal to 1 may be used as marks.

New marks are created automatically.  Existing marks can be moved
to another object simply by reusing the same `<idnum>` in another
`mark` command.

`tag`
~~~~~
Creates an annotated tag referring to a specific commit.  To create
lightweight (non-annotated) tags see the `reset` command below.

....
	'tag' SP <name> LF
	'from' SP <committish> LF
702
	'tagger' (SP <name>)? SP LT <email> GT SP <when> LF
703 704 705 706 707 708 709
	data
....

where `<name>` is the name of the tag to create.

Tag names are automatically prefixed with `refs/tags/` when stored
in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would
710
use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the
711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726
corresponding ref as `refs/tags/RELENG-1_0-FINAL`.

The value of `<name>` must be a valid refname in Git and therefore
may contain forward slashes.  As `LF` is not valid in a Git refname,
no quoting or escaping syntax is supported here.

The `from` command is the same as in the `commit` command; see
above for details.

The `tagger` command uses the same format as `committer` within
`commit`; again see above for details.

The `data` command following `tagger` must supply the annotated tag
message (see below for `data` command syntax).  To import an empty
tag message use a 0 length data.  Tag messages are free-form and are
not interpreted by Git.  Currently they must be encoded in UTF-8,
727
as fast-import does not permit other encodings to be specified.
728

729
Signing annotated tags during import from within fast-import is not
730 731 732
supported.  Trying to include your own PGP/GPG signature is not
recommended, as the frontend does not (easily) have access to the
complete set of bytes which normally goes into such a signature.
733
If signing is required, create lightweight tags from within fast-import with
734
`reset`, then create the annotated versions of those tags offline
735
with the standard 'git tag' process.
736 737 738 739 740 741 742 743 744 745 746

`reset`
~~~~~~~
Creates (or recreates) the named branch, optionally starting from
a specific revision.  The reset command allows a frontend to issue
a new `from` command for an existing branch, or to create a new
branch from an existing commit without creating a new commit.

....
	'reset' SP <ref> LF
	('from' SP <committish> LF)?
747
	LF?
748 749 750 751 752
....

For a detailed description of `<ref>` and `<committish>` see above
under `commit` and `from`.

753 754
The `LF` after the command is optional (it used to be required).

755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780
The `reset` command can also be used to create lightweight
(non-annotated) tags.  For example:

====
	reset refs/tags/938
	from :938
====

would create the lightweight tag `refs/tags/938` referring to
whatever commit mark `:938` references.

`blob`
~~~~~~
Requests writing one file revision to the packfile.  The revision
is not connected to any commit; this connection must be formed in
a subsequent `commit` command by referencing the blob through an
assigned mark.

....
	'blob' LF
	mark?
	data
....

The mark command is optional here as some frontends have chosen
to generate the Git SHA-1 for the blob on their own, and feed that
781
directly to `commit`.  This is typically more work than it's worth
782 783 784 785 786
however, as marks are inexpensive to store and easy to use.

`data`
~~~~~~
Supplies raw data (for use as blob/file content, commit messages, or
787
annotated tag messages) to fast-import.  Data can be supplied using an exact
788 789 790
byte count or delimited with a terminating line.  Real frontends
intended for production-quality conversions should always use the
exact byte count format, as it is more robust and performs better.
791
The delimited format is intended primarily for testing fast-import.
792

793 794 795 796 797
Comment lines appearing within the `<raw>` part of `data` commands
are always taken to be part of the body of the data and are therefore
never ignored by fast-import.  This makes it safe to import any
file/message content whose lines might start with `#`.

798 799 800
Exact byte count format::
	The frontend must specify the number of bytes of data.
+
801 802
....
	'data' SP <count> LF
803
	<raw> LF?
804
....
805
+
806
where `<count>` is the exact number of bytes appearing within
807 808
`<raw>`.  The value of `<count>` is expressed as an ASCII decimal
integer.  The `LF` on either side of `<raw>` is not
809
included in `<count>` and will not be included in the imported data.
810 811 812 813 814
+
The `LF` after `<raw>` is optional (it used to be required) but
recommended.  Always including it makes debugging a fast-import
stream easier as the next command always starts in column 0
of the next line, even if `<raw>` did not end with an `LF`.
815

816 817
Delimited format::
	A delimiter string is used to mark the end of the data.
818
	fast-import will compute the length by searching for the delimiter.
819
	This format is primarily useful for testing and is not
820 821
	recommended for real data.
+
822 823 824 825
....
	'data' SP '<<' <delim> LF
	<raw> LF
	<delim> LF
826
	LF?
827
....
828
+
829 830
where `<delim>` is the chosen delimiter string.  The string `<delim>`
must not appear on a line by itself within `<raw>`, as otherwise
831
fast-import will think the data ends earlier than it really does.  The `LF`
832 833 834
immediately trailing `<raw>` is part of `<raw>`.  This is one of
the limitations of the delimited format, it is impossible to supply
a data chunk which does not have an LF as its last byte.
835 836
+
The `LF` after `<delim> LF` is optional (it used to be required).
837 838 839

`checkpoint`
~~~~~~~~~~~~
840
Forces fast-import to close the current packfile, start a new one, and to
841
save out all current branch refs, tags and marks.
842 843 844

....
	'checkpoint' LF
845
	LF?
846 847
....

848
Note that fast-import automatically switches packfiles when the current
849
packfile reaches \--max-pack-size, or 4 GiB, whichever limit is
850
smaller.  During an automatic packfile switch fast-import does not update
851 852 853 854 855 856 857 858 859 860
the branch refs, tags or marks.

As a `checkpoint` can require a significant amount of CPU time and
disk IO (to compute the overall pack SHA-1 checksum, generate the
corresponding index file, and update the refs) it can easily take
several minutes for a single `checkpoint` command to complete.

Frontends may choose to issue checkpoints during extremely large
and long running imports, or when they need to allow another Git
process access to a branch.  However given that a 30 GiB Subversion
861
repository can be loaded into Git through fast-import in about 3 hours,
862 863
explicit checkpointing may not be necessary.

864
The `LF` after the command is optional (it used to be required).
865

866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883
`progress`
~~~~~~~~~~
Causes fast-import to print the entire `progress` line unmodified to
its standard output channel (file descriptor 1) when the command is
processed from the input stream.  The command otherwise has no impact
on the current import, or on any of fast-import's internal state.

....
	'progress' SP <any> LF
	LF?
....

The `<any>` part of the command may contain any sequence of bytes
that does not contain `LF`.  The `LF` after the command is optional.
Callers may wish to process the output through a tool such as sed to
remove the leading part of the line, for example:

====
884
	frontend | git fast-import | sed 's/^progress //'
885 886 887 888 889 890
====

Placing a `progress` command immediately after a `checkpoint` will
inform the reader when the `checkpoint` has been completed and it
can safely access the refs that fast-import updated.

891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906
`cat-blob`
~~~~~~~~~~
Causes fast-import to print a blob to a file descriptor previously
arranged with the `--cat-blob-fd` argument.  The command otherwise
has no impact on the current import; its main purpose is to
retrieve blobs that may be in fast-import's memory but not
accessible from the target repository.

....
	'cat-blob' SP <dataref> LF
....

The `<dataref>` can be either a mark reference (`:<idnum>`)
set previously or a full 40-byte SHA-1 of a Git blob, preexisting or
ready to be written.

907
Output uses the same format as `git cat-file --batch`:
908 909 910 911 912 913

====
	<sha1> SP 'blob' SP <size> LF
	<contents> LF
====

914 915 916 917
This command can be used anywhere in the stream that comments are
accepted.  In particular, the `cat-blob` command can be used in the
middle of a commit but not in the middle of a `data` command.

918 919 920 921 922 923
`feature`
~~~~~~~~~
Require that fast-import supports the specified feature, or abort if
it does not.

....
924
	'feature' SP <feature> ('=' <argument>)? LF
925 926
....

927
The <feature> part of the command may be any one of the following:
928

929 930 931 932 933 934 935 936
date-format::
export-marks::
relative-marks::
no-relative-marks::
force::
	Act as though the corresponding command-line option with
	a leading '--' was passed on the command line
	(see OPTIONS, above).
937

938 939 940 941 942
import-marks::
	Like --import-marks except in two respects: first, only one
	"feature import-marks" command is allowed per stream;
	second, an --import-marks= command-line option overrides
	any "feature import-marks" command in the stream.
943

944 945 946 947 948 949
cat-blob::
	Ignored.  Versions of fast-import not supporting the
	"cat-blob" command will exit with a message indicating so.
	This lets the import error out early with a clear message,
	rather than wasting time on the early part of an import
	before the unsupported command is detected.
950

951 952 953 954 955 956
notes::
	Require that the backend support the 'notemodify' (N)
	subcommand to the 'commit' command.
	Versions of fast-import not supporting notes will exit
	with a message indicating so.

957

S
Sverre Rabbelier 已提交
958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982
`option`
~~~~~~~~
Processes the specified option so that git fast-import behaves in a
way that suits the frontend's needs.
Note that options specified by the frontend are overridden by any
options the user may specify to git fast-import itself.

....
    'option' SP <option> LF
....

The `<option>` part of the command may contain any of the options
listed in the OPTIONS section that do not change import semantics,
without the leading '--' and is treated in the same way.

Option commands must be the first commands on the input (not counting
feature commands), to give an option command after any non-option
command is an error.

The following commandline options change import semantics and may therefore
not be passed as option:

* date-format
* import-marks
* export-marks
983
* cat-blob-fd
S
Sverre Rabbelier 已提交
984 985
* force

986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026
Crash Reports
-------------
If fast-import is supplied invalid input it will terminate with a
non-zero exit status and create a crash report in the top level of
the Git repository it was importing into.  Crash reports contain
a snapshot of the internal fast-import state as well as the most
recent commands that lead up to the crash.

All recent commands (including stream comments, file changes and
progress commands) are shown in the command history within the crash
report, but raw file data and commit messages are excluded from the
crash report.  This exclusion saves space within the report file
and reduces the amount of buffering that fast-import must perform
during execution.

After writing a crash report fast-import will close the current
packfile and export the marks table.  This allows the frontend
developer to inspect the repository state and resume the import from
the point where it crashed.  The modified branches and tags are not
updated during a crash, as the import did not complete successfully.
Branch and tag information can be found in the crash report and
must be applied manually if the update is needed.

An example crash:

====
	$ cat >in <<END_OF_INPUT
	# my very first test commit
	commit refs/heads/master
	committer Shawn O. Pearce <spearce> 19283 -0400
	# who is that guy anyway?
	data <<EOF
	this is my commit
	EOF
	M 644 inline .gitignore
	data <<EOF
	.gitignore
	EOF
	M 777 inline bob
	END_OF_INPUT

1027
	$ git fast-import <in
1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072
	fatal: Corrupt mode: M 777 inline bob
	fast-import: dumping crash report to .git/fast_import_crash_8434

	$ cat .git/fast_import_crash_8434
	fast-import crash report:
	    fast-import process: 8434
	    parent process     : 1391
	    at Sat Sep 1 00:58:12 2007

	fatal: Corrupt mode: M 777 inline bob

	Most Recent Commands Before Crash
	---------------------------------
	  # my very first test commit
	  commit refs/heads/master
	  committer Shawn O. Pearce <spearce> 19283 -0400
	  # who is that guy anyway?
	  data <<EOF
	  M 644 inline .gitignore
	  data <<EOF
	* M 777 inline bob

	Active Branch LRU
	-----------------
	    active_branches = 1 cur, 5 max

	  pos  clock name
	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	   1)      0 refs/heads/master

	Inactive Branches
	-----------------
	refs/heads/master:
	  status      : active loaded dirty
	  tip commit  : 0000000000000000000000000000000000000000
	  old tree    : 0000000000000000000000000000000000000000
	  cur tree    : 0000000000000000000000000000000000000000
	  commit clock: 0
	  last pack   :


	-------------------
	END OF CRASH REPORT
====

1073 1074 1075
Tips and Tricks
---------------
The following tips and tricks have been collected from various
1076
users of fast-import, and are offered here as suggestions.
1077 1078 1079 1080 1081

Use One Mark Per Commit
~~~~~~~~~~~~~~~~~~~~~~~
When doing a repository conversion, use a unique mark per commit
(`mark :<n>`) and supply the \--export-marks option on the command
1082
line.  fast-import will dump a file which lists every mark and the Git
1083 1084 1085 1086 1087 1088
object SHA-1 that corresponds to it.  If the frontend can tie
the marks back to the source repository, it is easy to verify the
accuracy and completeness of the import by comparing each Git
commit to the corresponding source revision.

Coming from a system such as Perforce or Subversion this should be
1089
quite simple, as the fast-import mark can also be the Perforce changeset
1090 1091 1092 1093 1094 1095
number or the Subversion revision number.

Freely Skip Around Branches
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Don't bother trying to optimize the frontend to stick to one branch
at a time during an import.  Although doing so might be slightly
1096
faster for fast-import, it tends to increase the complexity of the frontend
1097 1098
code considerably.

1099
The branch LRU builtin to fast-import tends to behave very well, and the
1100 1101 1102
cost of activating an inactive branch is so low that bouncing around
between branches has virtually no impact on import performance.

1103 1104 1105 1106 1107 1108 1109
Handling Renames
~~~~~~~~~~~~~~~~
When importing a renamed file or directory, simply delete the old
name(s) and modify the new name(s) during the corresponding commit.
Git performs rename detection after-the-fact, rather than explicitly
during a commit.

1110 1111 1112 1113 1114 1115 1116 1117
Use Tag Fixup Branches
~~~~~~~~~~~~~~~~~~~~~~
Some other SCM systems let the user create a tag from multiple
files which are not from the same commit/changeset.  Or to create
tags which are a subset of the files available in the repository.

Importing these tags as-is in Git is impossible without making at
least one commit which ``fixes up'' the files to match the content
1118
of the tag.  Use fast-import's `reset` command to reset a dummy branch
1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130
outside of your normal branch space to the base commit for the tag,
then commit one or more file fixup commits, and finally tag the
dummy branch.

For example since all normal branches are stored under `refs/heads/`
name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for
the fixup branch used by the importer to have namespace conflicts
with real branches imported from the source (the name `TAG_FIXUP`
is not `refs/heads/TAG_FIXUP`).

When committing fixups, consider using `merge` to connect the
commit(s) which are supplying file revisions to the fixup branch.
1131
Doing so will allow tools such as 'git blame' to track
1132 1133 1134
through the real commit history and properly annotate the source
files.

1135
After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP`
1136 1137 1138 1139
to remove the dummy branch.

Import Now, Repack Later
~~~~~~~~~~~~~~~~~~~~~~~~
1140
As soon as fast-import completes the Git repository is completely valid
1141
and ready for use.  Typically this takes only a very short time,
1142 1143 1144 1145 1146 1147 1148 1149 1150 1151
even for considerably large projects (100,000+ commits).

However repacking the repository is necessary to improve data
locality and access performance.  It can also take hours on extremely
large projects (especially if -f and a large \--window parameter is
used).  Since repacking is safe to run alongside readers and writers,
run the repack in the background and let it finish when it finishes.
There is no reason to wait to explore your new Git project!

If you choose to wait for the repack, don't try to run benchmarks
1152
or performance tests until repacking is completed.  fast-import outputs
1153 1154 1155 1156 1157 1158 1159
suboptimal packfiles that are simply never seen in real use
situations.

Repacking Historical Data
~~~~~~~~~~~~~~~~~~~~~~~~~
If you are repacking very old imported data (e.g. older than the
last year), consider expending some extra CPU time and supplying
1160
\--window=50 (or higher) when you run 'git repack'.
1161 1162 1163 1164
This will take longer, but will also produce a smaller packfile.
You only need to expend the effort once, and everyone using your
project will benefit from the smaller repository.

1165 1166 1167 1168 1169 1170 1171 1172 1173
Include Some Progress Messages
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Every once in a while have your frontend emit a `progress` message
to fast-import.  The contents of the messages are entirely free-form,
so one suggestion would be to output the current month and year
each time the current commit date moves into the next month.
Your users will feel better knowing how much of the data stream
has been processed.

1174

1175 1176
Packfile Optimization
---------------------
1177
When packing a blob fast-import always attempts to deltify against the last
1178 1179 1180 1181 1182 1183 1184 1185
blob written.  Unless specifically arranged for by the frontend,
this will probably not be a prior version of the same file, so the
generated delta will not be the smallest possible.  The resulting
packfile will be compressed, but will not be optimal.

Frontends which have efficient access to all revisions of a
single file (for example reading an RCS/CVS ,v file) can choose
to supply all revisions of that file as a sequence of consecutive
1186
`blob` commands.  This allows fast-import to deltify the different file
1187 1188 1189 1190
revisions against each other, saving space in the final packfile.
Marks can be used to later identify individual file revisions during
a sequence of `commit` commands.

1191 1192
The packfile(s) created by fast-import do not encourage good disk access
patterns.  This is caused by fast-import writing the data in the order
1193 1194 1195 1196 1197 1198
it is received on standard input, while Git typically organizes
data within packfiles to make the most recent (current tip) data
appear before historical data.  Git also clusters commits together,
speeding up revision traversal through better cache locality.

For this reason it is strongly recommended that users repack the
1199
repository with `git repack -a -d` after fast-import completes, allowing
1200 1201 1202 1203 1204
Git to reorganize the packfiles for faster data access.  If blob
deltas are suboptimal (see above) then also adding the `-f` option
to force recomputation of all deltas can significantly reduce the
final packfile size (30-50% smaller can be quite typical).

1205

1206 1207
Memory Utilization
------------------
1208
There are a number of factors which affect how much memory fast-import
1209
requires to perform an import.  Like critical sections of core
1210 1211
Git, fast-import uses its own memory allocators to amortize any overheads
associated with malloc.  In practice fast-import tends to amortize any
1212 1213 1214 1215
malloc overheads to 0, due to its use of large block allocations.

per object
~~~~~~~~~~
1216
fast-import maintains an in-memory structure for every object written in
1217 1218 1219
this execution.  On a 32 bit system the structure is 32 bytes,
on a 64 bit system the structure is 40 bytes (due to the larger
pointer sizes).  Objects in the table are not deallocated until
1220
fast-import terminates.  Importing 2 million objects on a 32 bit system
1221 1222 1223
will require approximately 64 MiB of memory.

The object table is actually a hashtable keyed on the object name
1224
(the unique SHA-1).  This storage configuration allows fast-import to reuse
1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243
an existing or already written object and avoid writing duplicates
to the output packfile.  Duplicate blobs are surprisingly common
in an import, typically due to branch merges in the source.

per mark
~~~~~~~~
Marks are stored in a sparse array, using 1 pointer (4 bytes or 8
bytes, depending on pointer size) per mark.  Although the array
is sparse, frontends are still strongly encouraged to use marks
between 1 and n, where n is the total number of marks required for
this import.

per branch
~~~~~~~~~~
Branches are classified as active and inactive.  The memory usage
of the two classes is significantly different.

Inactive branches are stored in a structure which uses 96 or 120
bytes (32 bit or 64 bit systems, respectively), plus the length of
1244
the branch name (typically under 200 bytes), per branch.  fast-import will
1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258
easily handle as many as 10,000 inactive branches in under 2 MiB
of memory.

Active branches have the same overhead as inactive branches, but
also contain copies of every tree that has been recently modified on
that branch.  If subtree `include` has not been modified since the
branch became active, its contents will not be loaded into memory,
but if subtree `src` has been modified by a commit since the branch
became active, then its contents will be loaded in memory.

As active branches store metadata about the files contained on that
branch, their in-memory storage size can grow to a considerable size
(see below).

1259
fast-import automatically moves active branches to inactive status based on
1260 1261
a simple least-recently-used algorithm.  The LRU chain is updated on
each `commit` command.  The maximum number of active branches can be
1262
increased or decreased on the command line with \--active-branches=.
1263 1264 1265 1266 1267

per active tree
~~~~~~~~~~~~~~~
Trees (aka directories) use just 12 bytes of memory on top of the
memory required for their entries (see ``per active file'' below).
1268
The cost of a tree is virtually 0, as its overhead amortizes out
1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279
over the individual file entries.

per active file entry
~~~~~~~~~~~~~~~~~~~~~
Files (and pointers to subtrees) within active trees require 52 or 64
bytes (32/64 bit platforms) per entry.  To conserve space, file and
tree names are pooled in a common string table, allowing the filename
``Makefile'' to use just 16 bytes (after including the string header
overhead) no matter how many times it occurs within the project.

The active branch LRU, when coupled with the filename string pool
1280
and lazy loading of subtrees, allows fast-import to efficiently import
1281 1282 1283
projects with 2,000+ branches and 45,114+ files in a very limited
memory footprint (less than 2.7 MiB per active branch).

1284 1285 1286 1287 1288 1289 1290
Signals
-------
Sending *SIGUSR1* to the 'git fast-import' process ends the current
packfile early, simulating a `checkpoint` command.  The impatient
operator can use this facility to peek at the objects and refs from an
import in progress, at the cost of some added running time and worse
compression.
1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301

Author
------
Written by Shawn O. Pearce <spearce@spearce.org>.

Documentation
--------------
Documentation by Shawn O. Pearce <spearce@spearce.org>.

GIT
---
1302
Part of the linkgit:git[1] suite