diff options
author | Jeff King <peff@peff.net> | 2016-09-27 08:38:01 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-27 10:29:56 -0700 |
commit | 5b33cb1fd733f581da07ae8afa7e9547eafd248e (patch) | |
tree | 439c5016deef9764172bca39e773ecaba2fec330 /contrib/subtree/git-subtree.txt | |
parent | get_short_sha1: list ambiguous objects on error (diff) | |
download | tgif-5b33cb1fd733f581da07ae8afa7e9547eafd248e.tar.xz |
get_short_sha1: make default disambiguation configurable
When we find ambiguous short sha1s, we may get a
disambiguation rule from our caller's context. But if we
don't, we fall back to treating all sha1s the same, even
though most projects will tend to refer only to commits by
their short sha1s.
This patch introduces a configuration option that lets the
user pick a different fallback (e.g., only commits). It's
possible that we may want to make this the default, but it's
a good idea to start as a config option for two reasons:
1. It lets people experiment with this and see if it's a
good idea (i.e., the "tend to" above is an assumption;
we don't really know if this will break some obscure
cases).
2. Even if we do flip the default, it gives people an
escape hatch if it causes problems (you can sometimes
override it by asking for "1234^{tree}", but not all
combinations are possible).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree/git-subtree.txt')
0 files changed, 0 insertions, 0 deletions