diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-11-28 13:45:58 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-01 13:28:04 -0800 |
| commit | 777f80d7429b0f2687cb9ff40f82b196b78384ff (patch) | |
| tree | 76da0afc4d9f0cddd9f5f6a1085c4c0aeda0b718 /Documentation | |
| parent | 85c62395b152f99e8867aaf84cea93dddc03243c (diff) | |
| download | git-777f80d7429b0f2687cb9ff40f82b196b78384ff.tar.gz git-777f80d7429b0f2687cb9ff40f82b196b78384ff.tar.xz | |
fast-import: Allow cat-blob requests at arbitrary points in stream
The new rule: a "cat-blob" can be inserted wherever a comment is
allowed, which means at the start of any line except in the middle of
a "data" command.
This saves frontends from having to loop over everything they want to
commit in the next commit and cat-ing the necessary objects in
advance.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-import.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 5d8f60c79..534b2519b 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -912,6 +912,10 @@ output uses the same format as `git cat-file --batch`: <contents> LF ==== +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. + `feature` ~~~~~~~~~ Require that fast-import supports the specified feature, or abort if |