[PATCH v2 1/2] revision: differentiate if --no-abbrev asked explicitly
- From
Đoàn Trần Công Danh <congdanhqx@gmail.com>
- Date
- Aug 11, 2020, 11:49 UTC
- Message-ID
- <9daef7445c09d355d4801f64e427c27dd6c44afb.1597146478.git.congdanhqx@gmail.com>
- In-Reply-To
- <cover.1597146478.git.congdanhqx@gmail.com>
When we see `--no-abbrev' in command's arguments, we reset `abbrev' of `diff_options` to 0, thus, on a later stage, the object id won't be shortened (by not set object_id[abbrev] to '\0').
While not doing anything is very effective way to show full object id, we couldn't differentiate if --no-abbrev or not.
In a later change, we want to extend --abbrev support to diff-patch format.
Let's ask for full object id if we see --no-abbrev instead.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- revision.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/revision.c b/revision.c index 3dcf689341..24027b1af3 100644 --- a/revision.c +++ b/revision.c @@ -2430,7 +2430,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--always")) { revs->always_show_header = 1; } else if (!strcmp(arg, "--no-abbrev")) { - revs->abbrev = 0; + revs->abbrev = hexsz; } else if (!strcmp(arg, "--abbrev")) { revs->abbrev = DEFAULT_ABBREV; } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
-- 2.28.0.215.g32ffa52ee0