     devPackages = @listPackages(@devPackagesDirectory, options)
     if devPackages.length > 0
       unless options.argv.bare or options.argv.json
-        console.log "#{@devPackagesDirectory.cyan} (#{devPackages.length})"
+        console.log "Dev Packages (#{devPackages.length})".cyan, "#{@devPackagesDirectory}"
     callback?(null, devPackages)
 
   listGitPackages: (options, callback) ->
-    gitPackages = @listPackages(@gitPackagesDirectory, options)
+    gitPackages = @listPackages(@userPackagesDirectory, options)
+      .filter (pack) -> pack.apmInstallSource?.type is 'git'
     if gitPackages.length > 0
       unless options.argv.bare or options.argv.json
-        console.log "#{@gitPackagesDirectory.cyan} (#{gitPackages.length})"
+        console.log "Git Packages (#{gitPackages.length})".cyan, "#{@userPackagesDirectory}"
     callback?(null, gitPackages)
 
   listBundledPackages: (options, callback) ->

  constructor: ->
    @userPackagesDirectory = path.join(config.getAtomDirectory(), 'packages')
    @devPackagesDirectory = path.join(config.getAtomDirectory(), 'dev', 'packages')
    @gitPackagesDirectory = path.join(config.getAtomDirectory(), 'git-packages')
    if configPath = CSON.resolve(path.join(config.getAtomDirectory(), 'config'))
      try
        @disabledPackages = CSON.readFileSync(configPath)?.core?.disabledPackages

_ = require 'underscore-plus'
CSON = require 'season'
yargs = require 'yargs'

Command = require './command'
fs = require './fs'
