Junio C Hamano 66c22ba6fb Merge branch 'jk/ambiguous-short-object-names' ... When given an abbreviated object name that is not (or more realistically, "no longer") unique, we gave a fatal error "ambiguous argument". This error is now accompanied by hints that lists the objects that begins with the given prefix. During the course of development of this new feature, numerous minor bugs were uncovered and corrected, the most notable one of which is that we gave "short SHA1 xxxx is ambiguous." twice without good reason. * jk/ambiguous-short-object-names: get_short_sha1: make default disambiguation configurable get_short_sha1: list ambiguous objects on error for_each_abbrev: drop duplicate objects sha1_array: let callbacks interrupt iteration get_short_sha1: mark ambiguity error for translation get_short_sha1: NUL-terminate hex prefix get_short_sha1: refactor init of disambiguation code get_short_sha1: parse tags when looking for treeish get_sha1: propagate flags to child functions get_sha1: avoid repeating ourselves via ONLY_TO_DIE get_sha1: detect buggy calls with multiple disambiguators		2016-10-06 14:53:10 -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 'bc/object-id'	2016-09-19 13:47:19 -07:00
annotate.c
apply.c	Convert read_mmblob to take struct object_id.	2016-09-07 12:59:42 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'mh/diff-indent-heuristic'	2016-09-26 16:09:16 -07:00
branch.c	i18n: branch: mark option description for translation	2016-09-15 13:17:32 -07:00
bundle.c
cat-file.c	sha1_array: let callbacks interrupt iteration	2016-09-26 11:46:41 -07:00
check-attr.c	give "nbuf" strbuf a more meaningful name	2016-02-01 13:43:02 -08:00
check-ignore.c	give "nbuf" strbuf a more meaningful name	2016-02-01 13:43:02 -08:00
check-mailmap.c	strbuf: introduce strbuf_getline_{lf,nul}()	2016-01-15 10:12:51 -08:00
check-ref-format.c	use xmallocz to avoid size arithmetic	2016-02-22 14:51:09 -08:00
checkout-index.c	introduce CHECKOUT_INIT	2016-09-22 13:42:18 -07:00
checkout.c	Merge branch 'rs/checkout-init-macro'	2016-09-26 16:09:21 -07:00
clean.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
clone.c	Merge branch 'nd/init-core-worktree-in-multi-worktree-world'	2016-10-03 13:30:35 -07:00
column.c	column: read lines with strbuf_getline()	2016-01-15 10:35:07 -08:00
commit-tree.c	builtin/commit-tree: convert to struct object_id	2016-09-07 12:59:43 -07:00
commit.c	Merge branch 'tg/add-chmod+x-fix'	2016-09-26 16:09:20 -07:00
config.c	i18n: config: mark error message for translation	2016-09-15 13:17:32 -07:00
count-objects.c
credential.c
describe.c	Remove get_object_hash.	2015-11-20 08:02:05 -05:00
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 'jk/setup-sequence-update'	2016-09-21 15:15:24 -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-pack: fix object_id of exact sha1	2016-03-01 11:19:19 -08:00
fetch.c	Merge branch 'jk/push-progress'	2016-08-03 15:10:28 -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	ref-filter: add option to match literal pattern	2015-09-17 10:02:49 -07:00
fsck.c	streaming: make stream_blob_to_fd take struct object_id	2016-09-07 12:59:42 -07:00
gc.c	Merge branch 'jk/reduce-gc-aggressive-depth'	2016-09-21 15:15:30 -07:00
get-tar-commit-id.c	usage: do not insist that standard input must come from a file	2015-10-16 15:27:52 -07:00
grep.c	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
hash-object.c	hash-object: always try to set up the git repository	2016-09-13 15:45:45 -07:00
help.c	help: introduce option --exclude-guides	2016-08-30 16:09:41 -07:00
index-pack.c	index-pack: add --max-input-size=<size> option	2016-08-24 12:31:05 -07:00
init-db.c	Merge branch 'nd/init-core-worktree-in-multi-worktree-world'	2016-10-03 13:30:35 -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	Merge branch 'jt/format-patch-rfc'	2016-09-26 16:09:17 -07:00
ls-files.c	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
ls-remote.c	ls-remote: add support for showing symrefs	2016-01-19 10:07:56 -08:00
ls-tree.c	convert trivial sprintf / strcpy calls to xsnprintf	2015-09-25 10:18:18 -07:00
mailinfo.c	mailinfo: libify	2015-10-21 15:59:34 -07:00
mailsplit.c	mailsplit: support unescaping mboxrd messages	2016-06-06 11:14:43 -07:00
merge-base.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
merge-file.c	builtin/merge-file.c: use error_errno()	2016-05-09 12:29:08 -07:00
merge-index.c	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
merge-ours.c
merge-recursive.c	i18n: merge-recursive: mark verbose message for translation	2016-09-15 13:17:32 -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	usage: do not insist that standard input must come from a file	2015-10-16 15:27:52 -07:00
mktree.c	Merge branch 'jk/tighten-alloc'	2016-02-26 13:37:16 -08:00
mv.c	Merge branch 'rs/copy-array'	2016-10-03 13:30:33 -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	notes: spell first word of error messages in lowercase	2016-09-15 13:17:32 -07:00
pack-objects.c	Merge branch 'ks/pack-objects-bitmap'	2016-09-21 15:15:21 -07:00
pack-redundant.c	convert trivial cases to ALLOC_ARRAY	2016-02-22 14:51:09 -08:00
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	Merge branch 'jk/repository-extension' into maint	2015-11-03 15:32:25 -08:00
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	cache: convert struct cache_entry to use struct object_id	2016-09-07 12:59:42 -07:00
receive-pack.c	sha1_array: let callbacks interrupt iteration	2016-09-26 11:46:41 -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	Sync with 2.6.1	2015-10-05 13:20:08 -07:00
reset.c	builtin/reset: convert to use struct object_id	2016-09-07 12:59:43 -07:00
rev-list.c	graph: add support for --line-prefix on all graph-aware output	2016-08-31 18:07:09 -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	builtin/rm: convert to use struct object_id	2016-09-07 12:59:42 -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	i18n: show-branch: mark plural strings for translation	2016-09-15 13:17:32 -07:00
show-ref.c	show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP	2015-11-20 08:02:07 -05:00
stripspace.c	stripspace: call U+0020 a "space" instead of a "blank"	2016-01-29 16:02:34 -08:00
submodule--helper.c	Merge branch 'jk/clone-recursive-progress'	2016-09-26 16:09:22 -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	convert trivial sprintf / strcpy calls to xsnprintf	2015-09-25 10:18:18 -07:00
unpack-objects.c	unpack-objects: add --max-input-size=<size> option	2016-08-24 12:31:05 -07:00
update-index.c	Merge branch 'tg/add-chmod+x-fix'	2016-09-26 16:09:20 -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