Currently the only way to end an import stream is to close it, which
is not desirable when the stream that's being used is shared. For
example, the remote helper infrastructure uses a pipe between it and
the helper process, part of the protocol is to send a fast-import
stream accross. Without a way to end the stream the remote helper
infrastructure is forced to limit itself to have a command that uses
a fast-import stream as it's last command.
Add a trivial 'done' command that causes fast-import to stop reading
from the stream and exit.
---
Very straightforward. It is handled in parse_feature() instead of
in parse_one_feature() because I didn't want to allow '--done' as a
commandline argument. Allowing it would be silly, it surves no
other purpose than to indicate up front that the stream will
contain a 'done' command at the end.
I'm fine too with dropping the feature and just adding the new
command, whichever is preferred.
Documentation/git-fast-import.txt | 17 ++++++++++++++++-
fast-import.c | 5 +++++
2 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 77a0a24..114f919 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -293,6 +293,10 @@ and control the current import process. More detailed discussion
creating a new commit and updating the branch to point at
the newly created commit.
+`done`::
+ Treated as if EOF was read. This command is optional and is
+ not needed to perform an import.
+
`tag`::
Creates an annotated tag object from an existing commit or
branch. Lightweight tags are not supported by this command,
@@ -885,17 +889,20 @@ The <feature> part of the command may be any string matching
^[a-zA-Z][a-zA-Z-]*$ and should be understood by fast-import.
Feature work identical as their option counterparts with the
-exception of the import-marks feature, see below.
+exception of the done and import-marks features, see below.
The following features are currently supported:
* date-format
+* done
* import-marks
* export-marks
* relative-marks
* no-relative-marks
* force
+If the done feature is specified, the done command must be supported.
+
The import-marks behaves differently from when it is specified as
commandline option in that only one "feature import-marks" is allowed
per stream. Also, any --import-marks= specified on the commandline
@@ -928,6 +935,14 @@ not be passed as option:
* export-marks
* force
+`done`
+~~~~~~
+
+Treated as if EOF was read. This can be used to stop fast-import
+from reading from the stream without closing the file handle. Such
+may be desired if the file handle is used for other purposes other
+than fast-import as well, and closing it is not desired.
+
Crash Reports
-------------
If fast-import is supplied invalid input it will terminate with a
diff --git a/fast-import.c b/fast-import.c
index ddad289..1c3fa7d 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -2817,6 +2817,9 @@ static void parse_feature(void)
if (parse_one_feature(feature, 1))
return;
+ if (!prefixcmp(feature, "done"))
+ return;
+
die("This version of fast-import does not support feature %s.", feature);
}
@@ -2935,6 +2938,8 @@ int main(int argc, const char **argv)
parse_new_blob();
else if (!prefixcmp(command_buf.buf, "commit "))
parse_new_commit();
+ else if (!prefixcmp(command_buf.buf, "done"))
+ break;
else if (!prefixcmp(command_buf.buf, "tag "))
parse_new_tag();
else if (!prefixcmp(command_buf.buf, "reset "))
--
1.7.2.1.240.g6a95c3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html