diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 11:48:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 11:48:38 -0700 |
| commit | 7f20008d14e3eececdc90c75d3a86ee6c250cb67 (patch) | |
| tree | 3a6d3d114ba58c45496cb456e01cd5945c3b1b34 | |
| parent | 5234b41f68ca1ab788513fdc059f9f2e01fd3f6e (diff) | |
| parent | 04a74b6cfa5ef4870263f84ac94a488d9f2ef14a (diff) | |
| download | git-7f20008d14e3eececdc90c75d3a86ee6c250cb67.tar.gz | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
fast-export: fix argument name in error messages
Documentation: distinguish between ref and offset deltas in pack-format
| -rw-r--r-- | Documentation/technical/pack-format.txt | 4 | ||||
| -rw-r--r-- | builtin/fast-export.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt index 0e37ec9de5..a37f1378d0 100644 --- a/Documentation/technical/pack-format.txt +++ b/Documentation/technical/pack-format.txt @@ -26,7 +26,9 @@ Git pack format (deltified representation) n-byte type and length (3-bit type, (n-1)*7+4-bit length) - 20-byte base object name + 20-byte base object name if OBJ_REF_DELTA or a negative relative + offset from the delta object's position in the pack if this + is an OBJ_OFS_DELTA object compressed delta data Observation: length of each object is encoded in a variable diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 77dffd1ce3..ad9d0c46e8 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -43,7 +43,7 @@ static int parse_opt_signed_tag_mode(const struct option *opt, else if (!strcmp(arg, "strip")) signed_tag_mode = STRIP; else - return error("Unknown signed-tag mode: %s", arg); + return error("Unknown signed-tags mode: %s", arg); return 0; } @@ -416,7 +416,7 @@ static void handle_tag(const char *name, struct tag *tag) switch(signed_tag_mode) { case ABORT: die ("Encountered signed tag %s; use " - "--signed-tag=<mode> to handle it.", + "--signed-tags=<mode> to handle it.", sha1_to_hex(tag->object.sha1)); case WARN: warning ("Exporting signed tag %s", |