Merged r10498 from trunk
scm: git: use with_settings instead of assigned setting at functional test
Authored by: tmaruyama 2012-09-28
Parent: [r10499]
Child: [r10501]
