diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 03:46:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 03:46:32 +0200 |
| commit | 2d5792f0716605ff0059fe4b5c865d6821c0161e (patch) | |
| tree | f54d21723cf1216001ec9643f91f0d60136a8643 /sequencer.c | |
| parent | commit-graph: implement "--append" option (diff) | |
| parent | replace: rename 'new' variables (diff) | |
| download | git-2d5792f0716605ff0059fe4b5c865d6821c0161e.tar.xz git-2d5792f0716605ff0059fe4b5c865d6821c0161e.zip | |
Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees
* bw/c-plus-plus: (37 commits)
replace: rename 'new' variables
trailer: rename 'template' variables
tempfile: rename 'template' variables
wrapper: rename 'template' variables
environment: rename 'namespace' variables
diff: rename 'template' variables
environment: rename 'template' variables
init-db: rename 'template' variables
unpack-trees: rename 'new' variables
trailer: rename 'new' variables
submodule: rename 'new' variables
split-index: rename 'new' variables
remote: rename 'new' variables
ref-filter: rename 'new' variables
read-cache: rename 'new' variables
line-log: rename 'new' variables
imap-send: rename 'new' variables
http: rename 'new' variables
entry: rename 'new' variables
diffcore-delta: rename 'new' variables
...
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 e9baaf59bd..6ca4499d23 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2870,7 +2870,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); |