summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-02-28 21:00:00 +0700
committerJunio C Hamano <gitster@pobox.com>2012-02-28 10:47:30 -0800
commit989937221a95cd6c3a829da043162e18e0371b1e (patch)
treec73378350bbdf2ca0d877c7532281f6521c6f6d8 /git-merge-one-file.sh
parent8ba8fe049feb9207dd3543c339da955336e5df8f (diff)
downloadgit-989937221a95cd6c3a829da043162e18e0371b1e.tar.gz
rev-list: fix --verify-objects --quiet becoming --objectsnd/maint-verify-objects
When --quiet is specified, finish_object() is called instead of show_object(). The latter is in charge of --verify-objects and will be skipped if --quiet is specified. Move the code up to finish_object(). Also pass the quiet flag along and make it always call show_* functions to avoid similar problems in future. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions