diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-26 00:14:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-26 00:14:22 -0800 |
| commit | 2db511fdbdbe1c8aab80f4bc13f0df037bce8a33 (patch) | |
| tree | 23350997a56089356ccaeaa923a783378c198bf6 /builtin-fast-export.c | |
| parent | b8d97d07fd5025232cae74cfc9a555abd9ac390e (diff) | |
| parent | 81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff) | |
| download | git-2db511fdbdbe1c8aab80f4bc13f0df037bce8a33.tar.gz | |
Merge branch 'maint'
* maint:
Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
timezone_names[]: fixed the tz offset for New Zealand.
filter-branch documentation: non-zero exit status in command abort the filter
rev-parse: fix potential bus error with --parseopt option spec handling
Use a single implementation and API for copy_file()
Documentation/git-filter-branch: add a new msg-filter example
Correct fast-export file mode strings to match fast-import standard
Diffstat (limited to 'builtin-fast-export.c')
| -rwxr-xr-x | builtin-fast-export.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c index f741df5220..4bd1356d50 100755 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -123,7 +123,7 @@ static void show_filemodify(struct diff_queue_struct *q, printf("D %s\n", spec->path); else { struct object *object = lookup_object(spec->sha1); - printf("M 0%06o :%d %s\n", spec->mode, + printf("M %06o :%d %s\n", spec->mode, get_object_mark(object), spec->path); } } |