2017-05-14 20:35 GMT-06:00 Junio C Hamano <gitster@xxxxxxxxx>: > "brian m. carlson" <sandals@xxxxxxxxxxxxxxxxxxxx> writes: > >> The recent change that introduced autodecorating of refs accidentally >> broke the ability of users to set log.decorate = false to override it. >> When the git_log_config was traversed a second time with an option other >> than log.decorate, the decoration style would be set to the automatic >> style, even if the user had already overridden it. Instead of setting >> the option in config parsing, set it in init_log_defaults instead. >> >> Add a test for this case. The actual additional config option doesn't >> matter, but it needs to be something not already set in the >> configuration file. >> >> Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> >> --- >> Changes from v2: >> * Add a test. I tested that the config parsing both works with >> additional options and also can be overridden from the command line. > > Thanks, all. > > Will queue with Acked-by by Alex and Reviewed-by by Jonathan. That sounds great, thank you. -Alex