diff options
| author | Brandon Williams <bmwill@google.com> | 2018-02-14 19:59:24 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-14 22:10:05 +0100 |
| commit | debca9d2fe784193dc2d9f98b5edac605ddfefbb (patch) | |
| tree | 080b732db21d1233d150c64311b9a013fb6aa200 /sequencer.c | |
| parent | object_info: change member name from 'typename' to 'type_name' (diff) | |
| download | git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.tar.xz git-debca9d2fe784193dc2d9f98b5edac605ddfefbb.zip | |
object: rename function 'typename' to 'type_name'
Rename C++ keyword in order to bring the codebase closer to being able
to be compiled with a C++ compiler.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 4d3f60594c..f6b77e6bda 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2348,7 +2348,7 @@ int sequencer_pick_revisions(struct replay_opts *opts) if (!lookup_commit_reference_gently(&oid, 1)) { enum object_type type = sha1_object_info(oid.hash, NULL); return error(_("%s: can't cherry-pick a %s"), - name, typename(type)); + name, type_name(type)); } } else return error(_("%s: bad revision"), name); |