Junio C Hamano b9b10d3681 read-tree: "read-tree -m --empty" does not make sense ...

fb1bb965 ("read-tree: deprecate syntax without tree-ish args",
2010-09-10) wanted to deprecate "git read-tree" without any tree,
which used to be the way to empty the index, and encourage use of
"git read-tree --empty" instead.

However, when used with "-m", "--empty" does not make any sense,
either, simply because merging 0 trees will result in a different
error anyway.

Omit the deprecation warning and let the code to emit real error
message diagnose the error.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

2017-05-10 21:42:17 -07:00

..

add.c

add: modify already added files when --chmod is given

2016-09-15 12:13:54 -07:00

am.c

Merge branch 'jc/am-read-author-file' into maint

2016-11-29 13:27:53 -08:00

annotate.c

…

apply.c

Merge branch 'va/i18n-even-more'

2016-07-13 11:24:10 -07:00

archive.c

…

bisect--helper.c

…

blame.c

blame: use DEFAULT_ABBREV macro

2016-09-28 14:56:00 -07:00

branch.c

Merge branch 'jk/create-branch-remove-unused-param' into maint

2016-11-29 13:28:02 -08:00

bundle.c

…

cat-file.c

cat-file: put spaces around pipes in usage string

2016-09-08 12:16:38 -07:00

check-attr.c

…

check-ignore.c

…

check-mailmap.c

strbuf: introduce strbuf_getline_{lf,nul}()

2016-01-15 10:12:51 -08:00

check-ref-format.c

…

checkout-index.c

…

checkout.c

Merge branch 'jk/create-branch-remove-unused-param' into maint

2016-11-29 13:28:02 -08:00

clean.c

…

clone.c

Merge branch 'jk/clone-copy-alternates-fix' into maint

2016-10-28 09:01:14 -07:00

column.c

…

commit-tree.c

Merge branch 'jc/commit-tree-ignore-commit-gpgsign'

2016-05-13 13:18:27 -07:00

commit.c

Merge branch 'rs/commit-pptr-simplify' into maint

2016-11-29 13:27:59 -08:00

config.c

Merge branch 'js/commit-slab-decl-fix'

2016-08-10 12:33:20 -07:00

count-objects.c

…

credential.c

…

describe.c

…

diff-files.c

diff: run arguments through precompose_argv

2016-05-13 14:35:49 -07:00

diff-index.c

diff: run arguments through precompose_argv

2016-05-13 14:35:49 -07:00

diff-tree.c

Merge branch 'ar/diff-args-osx-precompose' into maint

2016-06-06 14:27:35 -07:00

diff.c

Merge branch 'ar/diff-args-osx-precompose' into maint

2016-06-06 14:27:35 -07:00

fast-export.c

diff: convert struct diff_filespec to struct object_id

2016-06-28 11:39:02 -07:00

fetch-pack.c

…

fetch.c

Merge branch 'jk/fetch-quick-tag-following' into maint

2016-10-28 09:01:17 -07:00

fmt-merge-msg.c

use strbuf_addstr() for adding constant strings to a strbuf, part 2

2016-09-15 12:23:38 -07:00

for-each-ref.c

…

fsck.c

Merge branch 'nd/pack-ofs-4gb-limit' into maint

2016-08-08 14:21:36 -07:00

gc.c

Merge branch 'jk/reduce-gc-aggressive-depth' into maint

2016-09-29 16:49:42 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'nd/ita-cleanup' into maint

2016-07-28 11:25:51 -07:00

hash-object.c

…

help.c

Merge branch 'js/no-html-bypass-on-windows' into maint

2016-09-08 21:35:55 -07:00

index-pack.c

Merge branch 'jk/push-progress'

2016-08-03 15:10:28 -07:00

init-db.c

i18n: init-db: join message pieces

2016-06-17 15:46:10 -07:00

interpret-trailers.c

Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init

2016-06-13 10:37:48 -07:00

log.c

format-patch: show base info before email signature

2016-09-15 10:07:10 -07:00

ls-files.c

die("bug"): report bugs consistently

2016-07-26 11:13:44 -07:00

ls-remote.c

…

ls-tree.c

convert trivial sprintf / strcpy calls to xsnprintf

2015-09-25 10:18:18 -07:00

mailinfo.c

…

mailsplit.c

mailsplit: support unescaping mboxrd messages

2016-06-06 11:14:43 -07:00

merge-base.c

merge-base: handle --fork-point without reflog

2016-10-12 14:30:16 -07:00

merge-file.c

builtin/merge-file.c: use error_errno()

2016-05-09 12:29:08 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

merge-recursive: convert merge_recursive_generic() to object_id

2016-06-28 11:39:02 -07:00

merge-tree.c

struct name_entry: use struct object_id instead of unsigned char sha1[20]

2016-04-25 14:23:42 -07:00

merge.c

use strbuf_addstr() for adding constant strings to a strbuf, part 2

2016-09-15 12:23:38 -07:00

mktag.c

…

mktree.c

…

mv.c

Merge branch 'rs/copy-array' into maint

2016-10-11 14:18:32 -07:00

name-rev.c

Merge branch 'js/name-rev-use-oldest-ref' into maint

2016-05-31 14:08:26 -07:00

notes.c

i18n: notes: mark comment for translation

2016-07-28 09:09:18 -07:00

pack-objects.c

Merge branch 'jk/pack-tag-of-tag' into maint

2016-10-03 13:22:13 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

Merge branch 'rs/patch-id-use-skip-prefix'

2016-06-03 14:38:03 -07:00

prune-packed.c

…

prune.c

…

pull.c

Merge branch 'va/i18n-even-more'

2016-07-13 11:24:10 -07:00

push.c

push: accept push options

2016-07-14 15:50:41 -07:00

read-tree.c

read-tree: "read-tree -m --empty" does not make sense

2017-05-10 21:42:17 -07:00

receive-pack.c

Merge branch 'jk/tighten-alloc' into maint

2016-09-08 21:36:00 -07:00

reflog.c

struct name_entry: use struct object_id instead of unsigned char sha1[20]

2016-04-25 14:23:42 -07:00

remote-ext.c

typofix: assorted typofixes in comments, documentation and messages

2016-05-06 13:16:37 -07:00

remote-fd.c

…

remote.c

Merge branch 'mh/ref-iterators'

2016-07-25 14:13:33 -07:00

repack.c

Merge branch 'va/i18n-even-more'

2016-07-13 11:24:10 -07:00

replace.c

Merge branch 'js/replace-edit-use-editor-configuration' into maint

2016-05-06 14:53:24 -07:00

rerere.c

…

reset.c

Merge branch 'js/reset-usage' into maint

2016-10-28 09:01:22 -07:00

rev-list.c

rev-list: add optional progress reporting

2016-07-20 12:10:44 -07:00

rev-parse.c

use strbuf_addstr() for adding constant strings to a strbuf

2016-08-01 13:42:10 -07:00

revert.c

parse_options: allocate a new array when concatenating

2016-07-06 10:11:08 -07:00

rm.c

Merge branch 'rs/rm-strbuf-optim' into maint

2016-08-10 11:55:24 -07:00

send-pack.c

Merge branch 'sk/send-pack-all-fix' into maint

2016-04-29 14:15:57 -07:00

shortlog.c

Merge branch 'js/log-to-diffopt-file'

2016-07-19 13:22:15 -07:00

show-branch.c

…

show-ref.c

…

stripspace.c

…

submodule--helper.c

use strbuf_addstr() instead of strbuf_addf() with "%s", part 2

2016-09-27 14:02:40 -07:00

symbolic-ref.c

symbolic-ref -d: do not allow removal of HEAD

2016-09-02 09:01:38 -07:00

tag.c

Merge branch 'st/verify-tag'

2016-04-29 12:59:09 -07:00

unpack-file.c

…

unpack-objects.c

coccinelle: convert hashcpy() with null_sha1 to hashclr()

2016-06-28 11:39:02 -07:00

update-index.c

Merge branch 'tg/add-chmod+x-fix' into maint

2016-09-29 16:49:47 -07:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

builtin/upload-archive.c: use error_errno()

2016-05-09 12:29:08 -07:00

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

verify-tag: move tag verification code to tag.c

2016-04-22 14:06:46 -07:00

worktree.c

worktree: honor configuration variables

2016-09-27 10:51:33 -07:00

write-tree.c

…