Skip to content

Commit d27a0f5

Browse files
author
embs
committed
Do not track empty dir's children
When tracking empty dirs.
1 parent bb34846 commit d27a0f5

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

gitless/cli/helpers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ def process_paths():
132132
if not fps:
133133
open(os.path.join(curr_dir, core.GL_KEEP_FILENAME), 'a').close()
134134
fps.append(core.GL_KEEP_FILENAME)
135+
dirs[:] = []
135136
for fp in fps:
136137
yield os.path.join(curr_dir_rel, fp)
137138
else:

gitless/tests/test_e2e.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,16 @@ def test_track_empty_dir(self):
710710

711711
self.assertIn(expected_out, out, 'Empty dir wasn\'t tracked')
712712

713+
def test_track_parent_empty_dir(self):
714+
parent_empty_dir = self._mk_empty_dir('parent_empty_dir')
715+
child_dir = self._mk_empty_dir(os.path.join(parent_empty_dir, 'child_dir'))
716+
unexpected_out = 'Empty directory {0} is now a tracked directory'.format(
717+
os.path.join(child_dir, ''))
718+
719+
out = utils.stdout(gl.track(parent_empty_dir))
720+
721+
self.assertFalse(unexpected_out in out, 'Tracked empty dir child')
722+
713723
def test_tracked_empty_dir_status(self):
714724
tracked_empty_dir = self._mk_empty_dir('tracked_empty_dir')
715725
gl.track(tracked_empty_dir)

0 commit comments

Comments
 (0)