Use more CGit::CombinePath() to refactor code