esy-bash
Version:
Cross-platform bash utilities - primed for Reason/OCaml
1,537 lines (1,454 loc) • 96.6 kB
HTML
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-fast-import(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
/* Default font. */
body {
font-family: Georgia,serif;
}
/* Title font. */
h1, h2, h3, h4, h5, h6,
div.title, caption.title,
thead, p.table.header,
#toctitle,
#author, #revnumber, #revdate, #revremark,
#footer {
font-family: Arial,Helvetica,sans-serif;
}
body {
margin: 1em 5% 1em 5%;
}
a {
color: blue;
text-decoration: underline;
}
a:visited {
color: fuchsia;
}
em {
font-style: italic;
color: navy;
}
strong {
font-weight: bold;
color: #083194;
}
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
}
h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
padding-top: 0.5em;
}
h3 {
float: left;
}
h3 + * {
clear: left;
}
h5 {
font-size: 1.0em;
}
div.sectionbody {
margin-left: 0;
}
hr {
border: 1px solid silver;
}
p {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
ul, ol, li > p {
margin-top: 0;
}
ul > li { color: #aaa; }
ul > li > * { color: black; }
.monospaced, code, pre {
font-family: "Courier New", Courier, monospace;
font-size: inherit;
color: navy;
padding: 0;
margin: 0;
}
pre {
white-space: pre-wrap;
}
#author {
color: #527bbd;
font-weight: bold;
font-size: 1.1em;
}
#email {
}
#revnumber, #revdate, #revremark {
}
#footer {
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
#footer-text {
float: left;
padding-bottom: 0.5em;
}
#footer-badges {
float: right;
padding-bottom: 0.5em;
}
#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
}
div.admonitionblock {
margin-top: 2.0em;
margin-bottom: 2.0em;
margin-right: 10%;
color: #606060;
}
div.content { /* Block element content. */
padding: 0;
}
/* Block element titles. */
div.title, caption.title {
color: #527bbd;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
margin-bottom: 0.5em;
}
div.title + * {
margin-top: 0;
}
td div.title:first-child {
margin-top: 0.0em;
}
div.content div.title:first-child {
margin-top: 0.0em;
}
div.content + div.title {
margin-top: 0.0em;
}
div.sidebarblock > div.content {
background: #ffffee;
border: 1px solid #dddddd;
border-left: 4px solid #f0f0f0;
padding: 0.5em;
}
div.listingblock > div.content {
border: 1px solid #dddddd;
border-left: 5px solid #f0f0f0;
background: #f8f8f8;
padding: 0.5em;
}
div.quoteblock, div.verseblock {
padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
border-left: 5px solid #f0f0f0;
color: #888;
}
div.quoteblock > div.attribution {
padding-top: 0.5em;
text-align: right;
}
div.verseblock > pre.content {
font-family: inherit;
font-size: inherit;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
text-align: left;
}
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
div.admonitionblock .icon {
vertical-align: top;
font-size: 1.1em;
font-weight: bold;
text-decoration: underline;
color: #527bbd;
padding-right: 0.5em;
}
div.admonitionblock td.content {
padding-left: 0.5em;
border-left: 3px solid #dddddd;
}
div.exampleblock > div.content {
border-left: 3px solid #dddddd;
padding-left: 0.5em;
}
div.imageblock div.content { padding-left: 0; }
span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
dt {
margin-top: 0.5em;
margin-bottom: 0;
font-style: normal;
color: navy;
}
dd > *:first-child {
margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
ol.arabic {
list-style-type: decimal;
}
ol.loweralpha {
list-style-type: lower-alpha;
}
ol.upperalpha {
list-style-type: upper-alpha;
}
ol.lowerroman {
list-style-type: lower-roman;
}
ol.upperroman {
list-style-type: upper-roman;
}
div.compact ul, div.compact ol,
div.compact p, div.compact p,
div.compact div, div.compact div {
margin-top: 0.1em;
margin-bottom: 0.1em;
}
tfoot {
font-weight: bold;
}
td > div.verse {
white-space: pre;
}
div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
div.hdlist tr {
padding-bottom: 15px;
}
dt.hdlist1.strong, td.hdlist1.strong {
font-weight: bold;
}
td.hdlist1 {
vertical-align: top;
font-style: normal;
padding-right: 0.8em;
color: navy;
}
td.hdlist2 {
vertical-align: top;
}
div.hdlist.compact tr {
margin: 0;
padding-bottom: 0;
}
.comment {
background: yellow;
}
.footnote, .footnoteref {
font-size: 0.8em;
}
span.footnote, span.footnoteref {
vertical-align: super;
}
#footnotes {
margin: 20px 0 20px 0;
padding: 7px 0 0 0;
}
#footnotes div.footnote {
margin: 0 0 5px 0;
}
#footnotes hr {
border: none;
border-top: 1px solid silver;
height: 1px;
text-align: left;
margin-left: 0;
width: 20%;
min-width: 100px;
}
div.colist td {
padding-right: 0.5em;
padding-bottom: 0.3em;
vertical-align: top;
}
div.colist td img {
margin-top: 0.3em;
}
@media print {
#footer-badges { display: none; }
}
#toc {
margin-bottom: 2.5em;
}
#toctitle {
color: #527bbd;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
margin-bottom: 0.1em;
}
div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
div.toclevel2 {
margin-left: 2em;
font-size: 0.9em;
}
div.toclevel3 {
margin-left: 4em;
font-size: 0.9em;
}
div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
span.aqua { color: aqua; }
span.black { color: black; }
span.blue { color: blue; }
span.fuchsia { color: fuchsia; }
span.gray { color: gray; }
span.green { color: green; }
span.lime { color: lime; }
span.maroon { color: maroon; }
span.navy { color: navy; }
span.olive { color: olive; }
span.purple { color: purple; }
span.red { color: red; }
span.silver { color: silver; }
span.teal { color: teal; }
span.white { color: white; }
span.yellow { color: yellow; }
span.aqua-background { background: aqua; }
span.black-background { background: black; }
span.blue-background { background: blue; }
span.fuchsia-background { background: fuchsia; }
span.gray-background { background: gray; }
span.green-background { background: green; }
span.lime-background { background: lime; }
span.maroon-background { background: maroon; }
span.navy-background { background: navy; }
span.olive-background { background: olive; }
span.purple-background { background: purple; }
span.red-background { background: red; }
span.silver-background { background: silver; }
span.teal-background { background: teal; }
span.white-background { background: white; }
span.yellow-background { background: yellow; }
span.big { font-size: 2em; }
span.small { font-size: 0.6em; }
span.underline { text-decoration: underline; }
span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
div.unbreakable { page-break-inside: avoid; }
/*
* xhtml11 specific
*
* */
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
}
div.tableblock > table {
border: 3px solid #527bbd;
}
thead, p.table.header {
font-weight: bold;
color: #527bbd;
}
p.table {
margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
div.tableblock > table[frame="hsides"] {
border-left-style: none;
border-right-style: none;
}
div.tableblock > table[frame="vsides"] {
border-top-style: none;
border-bottom-style: none;
}
/*
* html5 specific
*
* */
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
}
thead, p.tableblock.header {
font-weight: bold;
color: #527bbd;
}
p.tableblock {
margin-top: 0;
}
table.tableblock {
border-width: 3px;
border-spacing: 0px;
border-style: solid;
border-color: #527bbd;
border-collapse: collapse;
}
th.tableblock, td.tableblock {
border-width: 1px;
padding: 4px;
border-style: solid;
border-color: #527bbd;
}
table.tableblock.frame-topbot {
border-left-style: hidden;
border-right-style: hidden;
}
table.tableblock.frame-sides {
border-top-style: hidden;
border-bottom-style: hidden;
}
table.tableblock.frame-none {
border-style: hidden;
}
th.tableblock.halign-left, td.tableblock.halign-left {
text-align: left;
}
th.tableblock.halign-center, td.tableblock.halign-center {
text-align: center;
}
th.tableblock.halign-right, td.tableblock.halign-right {
text-align: right;
}
th.tableblock.valign-top, td.tableblock.valign-top {
vertical-align: top;
}
th.tableblock.valign-middle, td.tableblock.valign-middle {
vertical-align: middle;
}
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
vertical-align: bottom;
}
/*
* manpage specific
*
* */
body.manpage h1 {
padding-top: 0.5em;
padding-bottom: 0.5em;
border-top: 2px solid silver;
border-bottom: 2px solid silver;
}
body.manpage h2 {
border-style: none;
}
body.manpage div.sectionbody {
margin-left: 3em;
}
@media print {
body.manpage div#toc { display: none; }
}
</style>
<script type="text/javascript">
/*<+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
var iterate = function (el) {
for (var i = el.firstChild; i != null; i = i.nextSibling) {
if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
var mo = re.exec(i.tagName);
if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
}
iterate(i);
}
}
}
iterate(el);
return result;
}
var toc = document.getElementById("toc");
if (!toc) {
return;
}
// Delete existing TOC entries in case we're reloading the TOC.
var tocEntriesToRemove = [];
var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
}
for (i = 0; i < tocEntriesToRemove.length; i++) {
toc.removeChild(tocEntriesToRemove[i]);
}
// Rebuild TOC entries.
var entries = tocEntries(document.getElementById("content"), toclevels);
for (var i = 0; i < entries.length; ++i) {
var entry = entries[i];
if (entry.element.id == "")
entry.element.id = "_toc_" + i;
var a = document.createElement("a");
a.href = "#" + entry.element.id;
a.appendChild(document.createTextNode(entry.text));
var div = document.createElement("div");
div.appendChild(a);
div.className = "toclevel" + entry.toclevel;
toc.appendChild(div);
}
if (entries.length == 0)
toc.parentNode.removeChild(toc);
},
/////////////////////////////////////////////////////////////////////
// Footnotes generator
/////////////////////////////////////////////////////////////////////
/* Based on footnote generation code from:
* http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
*/
footnotes: function () {
// Delete existing footnote entries in case we're reloading the footnodes.
var i;
var noteholder = document.getElementById("footnotes");
if (!noteholder) {
return;
}
var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
noteholder.removeChild(entriesToRemove[i]);
}
// Rebuild footnote entries.
var cont = document.getElementById("content");
var spans = cont.getElementsByTagName("span");
var refs = {};
var n = 0;
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnote") {
n++;
var note = spans[i].getAttribute("data-note");
if (!note) {
// Use [\s\S] in place of . so multi-line matches work.
// Because JavaScript has no s (dotall) regex flag.
note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
spans[i].innerHTML =
"[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
"' title='View footnote' class='footnote'>" + n + "</a>]";
spans[i].setAttribute("data-note", note);
}
noteholder.innerHTML +=
"<div class='footnote' id='_footnote_" + n + "'>" +
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
n + "</a>. " + note + "</div>";
var id =spans[i].getAttribute("id");
if (id != null) refs["#"+id] = n;
}
}
if (n == 0)
noteholder.parentNode.removeChild(noteholder);
else {
// Process footnoterefs.
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnoteref") {
var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
href = href.match(/#.*/)[0]; // Because IE return full URL.
n = refs[href];
spans[i].innerHTML =
"[<a href='#_footnote_" + n +
"' title='View footnote' class='footnote'>" + n + "</a>]";
}
}
}
},
install: function(toclevels) {
var timerId;
function reinstall() {
asciidoc.footnotes();
if (toclevels) {
asciidoc.toc(toclevels);
}
}
function reinstallAndRemoveTimer() {
clearInterval(timerId);
reinstall();
}
timerId = setInterval(reinstall, 500);
if (document.addEventListener)
document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
else
window.onload = reinstallAndRemoveTimer;
}
}
asciidoc.install();
/*]]>*/
</script>
</head>
<body class="manpage">
<div id="header">
<h1>
git-fast-import(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
<p>git-fast-import -
Backend for fast Git data importers
</p>
</div>
</div>
<div id="content">
<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<pre class="content">frontend | <em>git fast-import</em> [options]</pre>
<div class="attribution">
</div></div>
</div>
</div>
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>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
stored there to <em>git fast-import</em>.</p></div>
<div class="paragraph"><p>fast-import reads a mixed command/data stream from standard input and
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.</p></div>
<div class="paragraph"><p>The fast-import backend itself can import into an empty repository (one that
has already been initialized by <em>git init</em>) or incrementally
update an existing populated repository. Whether or not incremental
imports are supported from a particular foreign source depends on
the frontend program in use.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
--force
</dt>
<dd>
<p>
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).
</p>
</dd>
<dt class="hdlist1">
--quiet
</dt>
<dd>
<p>
Disable all non-fatal output, making fast-import silent when it
is successful. This option disables the output shown by
--stats.
</p>
</dd>
<dt class="hdlist1">
--stats
</dt>
<dd>
<p>
Display some basic statistics about the objects fast-import has
created, the packfiles they were stored into, and the
memory used by fast-import during this run. Showing this output
is currently the default, but can be disabled with --quiet.
</p>
</dd>
</dl></div>
<div class="sect2">
<h3 id="_options_for_frontends">Options for Frontends</h3>
<div class="dlist"><dl>
<dt class="hdlist1">
--cat-blob-fd=<fd>
</dt>
<dd>
<p>
Write responses to <code>get-mark</code>, <code>cat-blob</code>, and <code>ls</code> queries to the
file descriptor <fd> instead of <code>stdout</code>. Allows <code>progress</code>
output intended for the end-user to be separated from other
output.
</p>
</dd>
<dt class="hdlist1">
--date-format=<fmt>
</dt>
<dd>
<p>
Specify the type of dates the frontend will supply to
fast-import within <code>author</code>, <code>committer</code> and <code>tagger</code> commands.
See “Date Formats” below for details about which formats
are supported, and their syntax.
</p>
</dd>
<dt class="hdlist1">
--done
</dt>
<dd>
<p>
Terminate with error if there is no <code>done</code> command at the end of
the stream. This option might be useful for detecting errors
that cause the frontend to terminate before it has started to
write a stream.
</p>
</dd>
</dl></div>
</div>
<div class="sect2">
<h3 id="_locations_of_marks_files">Locations of Marks Files</h3>
<div class="dlist"><dl>
<dt class="hdlist1">
--export-marks=<file>
</dt>
<dd>
<p>
Dumps the internal marks table to <file> when complete.
Marks are written one per line as <code>:markid SHA-1</code>.
Frontends can use this file to validate imports after they
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.
</p>
</dd>
<dt class="hdlist1">
--import-marks=<file>
</dt>
<dd>
<p>
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.
</p>
</dd>
<dt class="hdlist1">
--import-marks-if-exists=<file>
</dt>
<dd>
<p>
Like --import-marks but instead of erroring out, silently
skips the file if it does not exist.
</p>
</dd>
<dt class="hdlist1">
--[no-]relative-marks
</dt>
<dd>
<p>
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.
</p>
<div class="paragraph"><p>Relative and non-relative marks may be combined by interweaving
--(no-)-relative-marks with the --(import|export)-marks= options.</p></div>
</dd>
</dl></div>
</div>
<div class="sect2">
<h3 id="_performance_and_compression_tuning">Performance and Compression Tuning</h3>
<div class="dlist"><dl>
<dt class="hdlist1">
--active-branches=<n>
</dt>
<dd>
<p>
Maximum number of branches to maintain active at once.
See “Memory Utilization” below for details. Default is 5.
</p>
</dd>
<dt class="hdlist1">
--big-file-threshold=<n>
</dt>
<dd>
<p>
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.
</p>
</dd>
<dt class="hdlist1">
--depth=<n>
</dt>
<dd>
<p>
Maximum delta depth, for blob and tree deltification.
Default is 50.
</p>
</dd>
<dt class="hdlist1">
--export-pack-edges=<file>
</dt>
<dd>
<p>
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
to <em>git pack-objects</em>.
</p>
</dd>
<dt class="hdlist1">
--max-pack-size=<n>
</dt>
<dd>
<p>
Maximum size of each output packfile.
The default is unlimited.
</p>
</dd>
<dt class="hdlist1">
fastimport.unpackLimit
</dt>
<dd>
<p>
See <a href="git-config.html">git-config(1)</a>
</p>
</dd>
</dl></div>
</div>
</div>
</div>
<div class="sect1">
<h2 id="_performance">Performance</h2>
<div class="sectionbody">
<div class="paragraph"><p>The design of fast-import allows it to import large projects in a minimum
amount of memory usage and processing time. Assuming the frontend
is able to keep up with fast-import and feed it a constant stream of data,
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.</p></div>
<div class="paragraph"><p>Most bottlenecks appear to be in foreign source data access (the
source just cannot extract revisions fast enough) or disk IO (fast-import
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).</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_development_cost">Development Cost</h2>
<div class="sectionbody">
<div class="paragraph"><p>A typical frontend for fast-import tends to weigh in at approximately 200
lines of Perl/Python/Ruby code. Most developers have been able to
create working importers in just a couple of hours, even though it
is their first exposure to fast-import, and sometimes even to Git. This is
an ideal situation, given that most conversion tools are throw-away
(use once, and never look back).</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_parallel_operation">Parallel Operation</h2>
<div class="sectionbody">
<div class="paragraph"><p>Like <em>git push</em> or <em>git fetch</em>, imports handled by fast-import are safe to
run alongside parallel <code>git repack -a -d</code> or <code>git gc</code> invocations,
or any other Git operation (including <em>git prune</em>, as loose objects
are never used by fast-import).</p></div>
<div class="paragraph"><p>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
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
fast-forward update, fast-import will skip updating that ref and instead
prints a warning message. fast-import will always attempt to update all
branch refs, and does not stop on the first failure.</p></div>
<div class="paragraph"><p>Branch updates can be forced with --force, but it’s recommended that
this only be used on an otherwise quiet repository. Using --force
is not necessary for an initial import into an empty repository.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_technical_discussion">Technical Discussion</h2>
<div class="sectionbody">
<div class="paragraph"><p>fast-import tracks a set of branches in memory. Any branch can be created
or modified at any point during the import process by sending a
<code>commit</code> 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.</p></div>
<div class="paragraph"><p>fast-import does not use or alter the current working directory, or any
file within it. (It does however update the current Git repository,
as referenced by <code>GIT_DIR</code>.) 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
directory also allows fast-import to run very quickly, as it does not
need to perform any costly file update operations when switching
between branches.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_input_format">Input Format</h2>
<div class="sectionbody">
<div class="paragraph"><p>With the exception of raw file data (which Git does not interpret)
the fast-import input format is text (ASCII) based. This text based
format simplifies development and debugging of frontend programs,
especially when a higher level language such as Perl, Python or
Ruby is being used.</p></div>
<div class="paragraph"><p>fast-import is very strict about its input. Where we say SP below we mean
<strong>exactly</strong> one space. Likewise LF means one (and only one) linefeed
and HT one (and only one) horizontal tab.
Supplying additional whitespace characters will cause unexpected
results, such as branch names or file names with leading or trailing
spaces in their name, or early termination of fast-import when it encounters
unexpected input.</p></div>
<div class="sect2">
<h3 id="_stream_comments">Stream Comments</h3>
<div class="paragraph"><p>To aid in debugging frontends fast-import ignores any line that
begins with <code>#</code> (ASCII pound/hash) up to and including the line
ending <code>LF</code>. 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.</p></div>
</div>
<div class="sect2">
<h3 id="_date_formats">Date Formats</h3>
<div class="paragraph"><p>The following date formats are supported. A frontend should select
the format it will use for this import by passing the format name
in the --date-format=<fmt> command-line option.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
<code>raw</code>
</dt>
<dd>
<p>
This is the Git native format and is <code><time> SP <offutc></code>.
It is also fast-import’s default format, if --date-format was
not specified.
</p>
<div class="paragraph"><p>The time of the event is specified by <code><time></code> as the number of
seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is
written as an ASCII decimal integer.</p></div>
<div class="paragraph"><p>The local offset is specified by <code><offutc></code> as a positive or negative
offset from UTC. For example EST (which is 5 hours behind UTC)
would be expressed in <code><tz></code> by “-0500” while UTC is “+0000”.
The local offset does not affect <code><time></code>; it is used only as an
advisement to help formatting routines display the timestamp.</p></div>
<div class="paragraph"><p>If the local offset is not available in the source material, use
“+0000”, or the most common local offset. For example many
organizations have a CVS repository which has only ever been accessed
by users who are located in the same location and time zone. In this
case a reasonable offset from UTC could be assumed.</p></div>
<div class="paragraph"><p>Unlike the <code>rfc2822</code> format, this format is very strict. Any
variation in formatting will cause fast-import to reject the value.</p></div>
</dd>
<dt class="hdlist1">
<code>rfc2822</code>
</dt>
<dd>
<p>
This is the standard email format as described by RFC 2822.
</p>
<div class="paragraph"><p>An example value is “Tue Feb 6 11:22:18 2007 -0500”. The Git
parser is accurate, but a little on the lenient side. It is the
same parser used by <em>git am</em> when applying patches
received from email.</p></div>
<div class="paragraph"><p>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.</p></div>
<div class="paragraph"><p>Unlike the <code>raw</code> format above, the time zone/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.</p></div>
<div class="paragraph"><p>If the source material uses RFC 2822 style dates,
the frontend should let fast-import handle the parsing and conversion
(rather than attempting to do it itself) as the Git parser has
been well tested in the wild.</p></div>
<div class="paragraph"><p>Frontends should prefer the <code>raw</code> format if the source material
already uses UNIX-epoch format, can be coaxed to give dates in that
format, or its format is easily convertible to it, as there is no
ambiguity in parsing.</p></div>
</dd>
<dt class="hdlist1">
<code>now</code>
</dt>
<dd>
<p>
Always use the current time and time zone. The literal
<code>now</code> must always be supplied for <code><when></code>.
</p>
<div class="paragraph"><p>This is a toy format. The current time and time zone of this system
is always copied into the identity string at the time it is being
created by fast-import. There is no way to specify a different time or
time zone.</p></div>
<div class="paragraph"><p>This particular format is supplied as it’s short to implement and
may be useful to a process that wants to create a new commit
right now, without needing to use a working directory or
<em>git update-index</em>.</p></div>
<div class="paragraph"><p>If separate <code>author</code> and <code>committer</code> commands are used in a <code>commit</code>
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 <code>author</code> (thus copying from <code>committer</code>) or to use a
date format other than <code>now</code>.</p></div>
</dd>
</dl></div>
</div>
<div class="sect2">
<h3 id="_commands">Commands</h3>
<div class="paragraph"><p>fast-import accepts several commands to update the current repository
and control the current import process. More detailed discussion
(with examples) of each command follows later.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
<code>commit</code>
</dt>
<dd>
<p>
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.
</p>
</dd>
<dt class="hdlist1">
<code>tag</code>
</dt>
<dd>
<p>
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.
</p>
</dd>
<dt class="hdlist1">
<code>reset</code>
</dt>
<dd>
<p>
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.
</p>
</dd>
<dt class="hdlist1">
<code>blob</code>
</dt>
<dd>
<p>
Convert raw file data into a blob, for future use in a
<code>commit</code> command. This command is optional and is not
needed to perform an import.
</p>
</dd>
<dt class="hdlist1">
<code>checkpoint</code>
</dt>
<dd>
<p>
Forces fast-import to close the current packfile, generate its
unique SHA-1 checksum and index, and start a new packfile.
This command is optional and is not needed to perform
an import.
</p>
</dd>
<dt class="hdlist1">
<code>progress</code>
</dt>
<dd>
<p>
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.
</p>
</dd>
<dt class="hdlist1">
<code>done</code>
</dt>
<dd>
<p>
Marks the end of the stream. This command is optional
unless the <code>done</code> feature was requested using the
<code>--done</code> command-line option or <code>feature done</code> command.
</p>
</dd>
<dt class="hdlist1">
<code>get-mark</code>
</dt>
<dd>
<p>
Causes fast-import to print the SHA-1 corresponding to a mark
to the file descriptor set with <code>--cat-blob-fd</code>, or <code>stdout</code> if
unspecified.
</p>
</dd>
<dt class="hdlist1">
<code>cat-blob</code>
</dt>
<dd>
<p>
Causes fast-import to print a blob in <em>cat-file --batch</em>
format to the file descriptor set with <code>--cat-blob-fd</code> or
<code>stdout</code> if unspecified.
</p>
</dd>
<dt class="hdlist1">
<code>ls</code>
</dt>
<dd>
<p>
Causes fast-import to print a line describing a directory
entry in <em>ls-tree</em> format to the file descriptor set with
<code>--cat-blob-fd</code> or <code>stdout</code> if unspecified.
</p>
</dd>
<dt class="hdlist1">
<code>feature</code>
</dt>
<dd>
<p>
Enable the specified feature. This requires that fast-import
supports the specified feature, and aborts if it does not.
</p>
</dd>
<dt class="hdlist1">
<code>option</code>
</dt>
<dd>
<p>
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.
</p>
</dd>
</dl></div>
</div>
<div class="sect2">
<h3 id="_code_commit_code"><code>commit</code></h3>
<div class="paragraph"><p>Create or update a branch with a new commit, recording one logical
change to the project.</p></div>
<div class="literalblock">
<div class="content">
<pre><code> 'commit' SP <ref> LF
mark?
('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
'committer' (SP <name>)? SP LT <email> GT SP <when> LF
data
('from' SP <commit-ish> LF)?
('merge' SP <commit-ish> LF)?
(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*
LF?</code></pre>
</div></div>
<div class="paragraph"><p>where <code><ref></code> is the name of the branch to make the commit on.
Typically branch names are prefixed with <code>refs/heads/</code> in
Git, so importing the CVS branch symbol <code>RELENG-1_0</code> would use
<code>refs/heads/RELENG-1_0</code> for the value of <code><ref></code>. The value of
<code><ref></code> must be a valid refname in Git. As <code>LF</code> is not valid in
a Git refname, no quoting or escaping syntax is supported here.</p></div>
<div class="paragraph"><p>A <code>mark</code> command may optionally appear, requesting fast-import to save a
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.</p></div>
<div class="paragraph"><p>The <code>data</code> command following <code>committer</code> must supply the commit
message (see below for <code>data</code> 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
UTF-8, as fast-import does not permit other encodings to be specified.</p></div>
<div class="paragraph"><p>Zero or more <code>filemodify</code>, <code>filedelete</code>, <code>filecopy</code>, <code>filerename</code>,
<code>filedeleteall</code> and <code>notemodify</code> commands
may be included to update the contents of the branch prior to
creating the commit. These commands may be supplied in any order.
However it is recommended that a <code>filedeleteall</code> command precede
all <code>filemodify</code>, <code>filecopy</code>, <code>filerename</code> and <code>notemodify</code> commands in
the same commit, as <code>filedeleteall</code> wipes the branch clean (see below).</p></div>
<div class="paragraph"><p>The <code>LF</code> after the command is optional (it used to be required).</p></div>
<div class="sect3">
<h4 id="_code_author_code"><code>author</code></h4>
<div class="paragraph"><p>An <code>author</code> command may optionally appear, if the author information
might differ from the committer information. If <code>author</code> is omitted
then fast-import will automatically use the committer’s information for
the author portion of the commit. See below for a description of
the fields in <code>author</code>, as they are identical to <code>committer</code>.</p></div>
</div>
<div class="sect3">
<h4 id="_code_committer_code"><code>committer</code></h4>
<div class="paragraph"><p>The <code>committer</code> command indicates who made this commit, and when
they made it.</p></div>
<div class="paragraph"><p>Here <code><name></code> is the person’s display name (for example
“Com M Itter”) and <code><email></code> is the person’s email address
(“cm@example.com”). <code>LT</code> and <code>GT</code> 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
<code><name></code> and <code><email></code> are free-form and may contain any sequence
of bytes, except <code>LT</code>, <code>GT</code> and <code>LF</code>. <code><name></code> is typically UTF-8 encoded.</p></div>
<div class="paragraph"><p>The time of the change is specified by <code><when></code> using the date format
that was selected by the --date-format=<fmt> command-line option.
See “Date Formats” above for the set of supported formats, and
their syntax.</p></div>
</div>
<div class="sect3">
<h4 id="_code_from_code"><code>from</code></h4>
<div class="paragraph"><p>The <code>from</code> command is used to specify the commit to initialize
this branch from. This revision will be the first ancestor of the
new commit. The state of the tree built at this commit will begin
with the state at the <code>from</code> commit, and be altered by the content
modifications in this commit.</p></div>
<div class="paragraph"><p>Omitting the <code>from</code> 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.
If the frontend creates all files from scratch when making a new
branch, a <code>merge</code> command may be used instead of <code>from</code> to start
the commit with an empty tree.
Omitting the <code>from</code> 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.</p></div>
<div class="paragraph"><p>As <code>LF</code> is not valid in a Git refname or SHA-1 expression, no
quoting or escaping syntax is supported within <code><commit-ish></code>.</p></div>
<div class="paragraph"><p>Here <code><commit-ish></code> is any of the following:</p></div>
<div class="ulist"><ul>
<li>
<p>
The name of an existing branch already in fast-import’s internal branch
table. If fast-import doesn’t know the name, it’s treated as a SHA-1
expression.
</p>
</li>
<li>
<p>
A mark reference, <code>:<idnum></code>, where <code><idnum></code> is the mark number.
</p>
<div class="paragraph"><p>The reason fast-import uses <code>:</code> to denote a mark reference is this character
is not legal in a Git branch name. The leading <code>:</code> makes it easy
to distinguish between the mark 42 (<code>:42</code>) and the branch 42 (<code>42</code>
or <code>refs/heads/42</code>), or an abbreviated SHA-1 which happened to
consist only of base-10 digits.</p></div>
<div class="paragraph"><p>Marks must be declared (via <code>mark</code>) before they can be used.</p></div>
</li>
<li>
<p>
A complete 40 byte or abbreviated commit SHA-1 in hex.
</p>
</li>
<li>
<p>
Any valid Git SHA-1 expression that resolves to a commit. See
“SPECIFYING REVISIONS” in <a href="gitrevisions.html">gitrevisions(7)</a> for details.
</p>
</li>
<li>
<p>
The special null SHA-1 (40 zeros) specifies that the branch is to be
removed.
</p>
</li>
</ul></div>
<div class="paragraph"><p>The special case of restarting an incremental import from the
current branch value should be written as:</p></div>
<div class="listingblock">
<div class="content">
<pre><code> from refs/heads/branch^0</code></pre>
</div></div>
<div class="paragraph"><p>The <code>^0</code> suffix is necessary as fast-import does not permit a branch to
start from itself, and the branch is created in memory before the
<code>from</code> command is even read from the input. Adding <code>^0</code> will force
fast-import to resolve the commit through Git’s revision parsing library,
rather than its internal branch table, thereby loading in the
existing value of the branch.</p></div>
</div>
<div class="sect3">
<h4 id="_code_merge_code"><code>merge</code></h4>
<div class="paragraph"><p>Includes one additional ancestor commit. The additional ancestry
link does not change the way the tree state is built at this commit.
If the <code>from</code> command is
omitted when creating a new branch, the first <code>merge</code> commit will be
the first ancestor of the current commit, and the branch will start
out with no files. An unlimited number of <code>merge</code> commands per
commit are permitted by fast-import, thereby establishing an n-way merge.</p></div>
<div class="paragraph"><p>Here <code><commit-ish></code> is any of the commit specification expressions
also accepted by <code>from</code> (see above).</p></div>
</div>
<div class="sect3">
<h4 id="_code_filemodify_code"><code>filemodify</code></h4>
<div class="paragraph"><p>Included in a <code>commit</code> 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.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
External data format
</dt>
<dd>
<p>
The data content for the file was already supplied by a prior
<code>blob</code> command. The frontend just needs to connect it.
</p>
<div class="literalblock">
<div class="content">
<pre><code> 'M' SP <mode> SP <dataref> SP <path> LF</code></pre>
</div></div>
<div class="paragraph"><p>Here usually <code><dataref></code> must be either a mark reference (<code>:<idnum></code>)
set by a prior <code>blob</code> command, or a full 40-byte SHA-1 of an
existing Git blob object. If <code><mode></code> is <code>040000`</code> then
<code><dataref></code> must be the full 40-byte SHA-1 of an existing
Git tree object or a mark reference set with <code>--import-marks</code>.</p></div>
</dd>
<dt class="hdlist1">
Inline data format
</dt>
<dd>
<p>
The data content for the file has not been supplied yet.
The frontend wants to supply it as part of this modify
command.
</p>
<div class="literalblock">
<div class="content">
<pre><code> 'M' SP <mode> SP 'inline' SP <path> LF
data</code></pre>
</div></div>
<div class="paragraph"><p>See below for a detailed description of the <code>data</code> command.</p></div>
</dd>
</dl></div>
<div class="paragraph"><p>In both formats <code><mode></code> is the type of file entry, specified
in octal. Git only supports the following modes:</p></div>
<div class="ulist"><ul>
<li>
<p>
<code>100644</code> or <code>644</code>: A normal (not-executable) file. The majority
of files in most projects use this mode. If in doubt, this is
what you want.
</p>
</li>
<li>
<p>
<code>100755</code> or <code>755</code>: A normal, but executable, file.
</p>
</li>
<li>
<p>
<code>120000</code>: A symlink, the content of the file will be the link target.
</p>
</li>
<li>
<p>
<code>160000</code>: 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.
</p>
</li>
<li>
<p>
<code>040000</code>: A subdirectory. Subdirectories can only be specified by
SHA or through a tree mark set with <code>--import-marks</code>.
</p>
</li>
</ul></div>
<div class="paragraph"><p>In both formats <code><path></code> is the complete path of the file to be added
(if not already existing) or modified (if already existing).</p></div>
<div class="paragraph"><p>A <code><path></code> string must use UNIX-style directory separators (forward
slash <code>/</code>), may contain any byte other than <code>LF</code>, and must not
start with double quote (<code>"</code>).</p></div>
<div class="paragraph"><p>A path can use C-style string quoting; this is accepted in all cases
and mandatory if the filename starts with double quote or contains
<code>LF</code>. In C-style quoting, the complete name should be surrounded with
double quotes, and any <code>LF</code>, backslash, or double quote characters
must be escaped by preceding them with a backslash (e.g.,
<code>"path/with\n, \\ and \" in it"</code>).</p></div>
<div class="paragraph"><p>The value of <code><path></code> must be in canonical form. That is it must not:</p></div>
<div class="ulist"><ul>
<li>
<p>
contain an empty directory component (e.g. <code>foo//bar</code> is invalid),
</p>
</li>
<li>
<p>
end with a directory separator (e.g. <code>foo/</code> is invalid),
</p>
</li>
<li>
<p>
start with a directory separator (e.g. <code>/foo</code> is invalid),
</p>
</li>
<li>
<p>
contain the special component <code>.</code> or <code>..</code> (e.g. <code>foo/./bar</code> and
<code>foo/../bar</code> are invalid).
</p>
</li>
</ul></div>
<div class="paragraph"><p>The root of the tree can be represented by an empty string as <code><path></code>.</p></div>
<div class="paragraph"><p>It is recommended that <code><path></code> always be encoded using UTF-8.</p></div>
</div>
<div class="sect3">
<h4 id="_code_filedelete_code"><code>filedelete</code></h4>
<div class="paragraph"><p>Included in a <code>commit</code> command to remove a file or recursively
delete an entire directory from the b