Don't reuse entry from trees if we're tracking-branch

1 files changed, 2 insertions, 1 deletions

diff --git a/ybd/pots.py b/ybd/pots.py
index 07bb644..4debe4e 100644
--- a/ybd/pots.py
+++ b/ybd/pots.py
@@ -21,6 +21,7 @@ from app import config, log
 from defaults import Defaults
 from morphs import Morphs
 from morphdumper import morph_dump
+from repos import tracking_branch
 
 
 class Pots(object):
@@ -82,7 +83,7 @@ class Pots(object):
                 dn = self._data[path]
                 sha1 = dn.get('sha', dn.get('ref'))
                 tree_entry = self._trees.get(path)
-                if sha1 and tree_entry:
+                if sha1 and tree_entry and not tracking_branch(dn):
                     if sha1 == tree_entry[0]:
                         dn['sha'] = tree_entry[0]
                         dn['tree'] = tree_entry[1]