Merge branch 'jk/clean-d-pathspec'
commit15520a858f5c3468eaa7f9c844218714d3bc1687
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 20:47:57 +0000 (18 13:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 20:47:57 +0000 (18 13:47 -0700)
treed8dfba48ab92b5bd0430de48fe98f3664148a924
parent00eda23228acb68c85a76f977f4e59f82189ce3f
parent1f2e1088871e777355025a84f80a2d8b5cb04c06
Merge branch 'jk/clean-d-pathspec'

"git clean -d pathspec" did not use the given pathspec correctly
and ended up cleaning too much.

* jk/clean-d-pathspec:
  clean: simplify dir/not-dir logic
  clean: respect pathspecs with "-d"
builtin/clean.c