From: Sverre Rabbelier <srabbelier@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Shawn O. Pearce" <spearce@spearce.org>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Git List" <git@vger.kernel.org>
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH 2/4] fast-import: define a new option command
Date: Wed, 12 Aug 2009 22:09:44 -0700 [thread overview]
Message-ID: <1250140186-12363-3-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1250140186-12363-2-git-send-email-srabbelier@gmail.com>
This allows the frontend to specify any of the supported options as
long as no non-option command has been given.
---
As requested, updated the documentation of the language format
Documentation/git-fast-import.txt | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index c2f483a..6b5bc1b 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -303,6 +303,11 @@ and control the current import process. More detailed discussion
standard output. This command is optional and is not needed
to perform an import.
+`option`::
+ Specify any of the options listed under OPTIONS to change
+ fast-import's behavior to suit the frontends needs. This command
+ is optional and is not needed to perform an import.
+
`commit`
~~~~~~~~
Create or update a branch with a new commit, recording one logical
@@ -813,6 +818,24 @@ 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.
+`option`
+~~~~~~~~
+Processes the specified option so that git fast-import behaves in a
+way that suits the front-ends needs.
+Note that options specified by the frontend override 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, without the leading '--' and is
+treated in the same way.
+
+Option commands must be the first commands on the input, to give an
+option command after any non-option command is an error.
+
Crash Reports
-------------
If fast-import is supplied invalid input it will terminate with a
--
1.6.4.16.g72c66.dirty
next prev parent reply other threads:[~2009-08-13 5:10 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-13 5:09 [PATCH 0/4] fast-import: add a new option command Sverre Rabbelier
2009-08-13 5:09 ` [PATCH 1/4] fast-import: put option parsing code in seperate functions Sverre Rabbelier
2009-08-13 5:09 ` Sverre Rabbelier [this message]
2009-08-13 5:09 ` [PATCH 3/4] fast-import: add option command Sverre Rabbelier
2009-08-13 5:09 ` [PATCH 4/4] fast-import: test the new " Sverre Rabbelier
2009-08-13 14:45 ` [PATCH 3/4] fast-import: add " Shawn O. Pearce
2009-08-13 14:43 ` [PATCH 2/4] fast-import: define a new " Shawn O. Pearce
2009-08-13 14:56 ` Johannes Schindelin
2009-08-13 15:04 ` Shawn O. Pearce
[not found] ` <fabb9a1e0908130812s297ccfc6vd6b746daf1dcc69a@mail.gmail.com>
2009-08-13 15:24 ` Shawn O. Pearce
2009-08-13 16:26 ` Sverre Rabbelier
2009-08-13 17:07 ` Johannes Schindelin
2009-08-13 17:09 ` Sverre Rabbelier
2009-08-13 17:25 ` Shawn O. Pearce
2009-08-13 17:28 ` Sverre Rabbelier
2009-08-13 17:41 ` Shawn O. Pearce
2009-08-13 17:44 ` Sverre Rabbelier
2009-08-13 17:52 ` Shawn O. Pearce
2009-08-13 21:51 ` Johannes Schindelin
2009-08-13 22:01 ` Sverre Rabbelier
2009-08-13 22:12 ` Shawn O. Pearce
2009-08-13 22:17 ` Sverre Rabbelier
2009-08-13 19:26 ` Junio C Hamano
2009-08-13 20:01 ` Sverre Rabbelier
2009-08-13 20:42 ` Junio C Hamano
2009-08-13 21:14 ` Sverre Rabbelier
2009-11-23 17:39 ` Sverre Rabbelier
2009-11-23 20:50 ` Shawn O. Pearce
2009-08-13 10:19 ` [PATCH 1/4] fast-import: put option parsing code in seperate functions Johannes Schindelin
2009-08-13 14:40 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1250140186-12363-3-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox