diff --git a/.travis.yml b/.travis.yml
index 14607b3..dc86e18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,5 @@ node_js:
   - "0.11"
 
 install:
-  - "npm install -g npm"
+  - "npm install -g npm@1.4.28"
   - "npm install"
diff --git a/README.md b/README.md
index 1982e9b..565ed6c 100644
--- a/README.md
+++ b/README.md
@@ -136,8 +136,10 @@ Equivalent to `git remote set-url --delete <name> <url>`.
 with branch parameter specified:
 `git push <name> <branch>`
 
-### `Repo#status(callback)`
-Uses `--porcelain` to parse repository status in a way that is agnostic of system language. The callback receives `(err, status)`. See below for a definition of what `status` is.
+### `Repo#status([options, ]callback)`
+Uses `--porcelain` to parse repository status in a way that is agnostic of system language.
+`options` is a string of any other options you'd like to pass to the status command.  For example, the `-u` option will list each file in an untracked directory rather than simply listing the directory itself.
+ The callback receives `(err, status)`. See below for a definition of what `status` is.
 
 ### `Repo#config(callback)`
 `git config` parsed as a simple, one-level object. The callback receives `(err, config)`.
diff --git a/package.json b/package.json
index d0f6a8f..03bccef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gift",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "a Git wrapper library",
   "keywords": [
     "git",
@@ -28,11 +28,11 @@
     "underscore": "1.x.x"
   },
   "devDependencies": {
+    "coffee-script": "^1.7.1",
+    "fs-extra": "^0.9.1",
+    "mocha": "^1.20.1",
     "should": "~4.0.4",
-    "mocha": "~1.20.1",
-    "sinon": "~1.7.3",
-    "coffee-script": "~1.7.1",
-    "fs-extra": "~0.9.1"
+    "sinon": "^1.7.3"
   },
   "engines": {
     "node": "> 0.4.1"
diff --git a/src/repo.coffee b/src/repo.coffee
index 450af63..aa992fb 100644
--- a/src/repo.coffee
+++ b/src/repo.coffee
@@ -271,8 +271,9 @@ module.exports = class Repo
   #
   # callback - Receives `(err, status)`
   #
-  status: (callback) ->
-    return Status(this, callback)
+  status: (options, callback) ->
+    [options, callback] = [callback, options] if !callback;
+    return Status(this, options, callback)
 
   # Public: Show information about files in the index and the
   #         working tree.
diff --git a/src/status.coffee b/src/status.coffee
index fe591ed..534ef2c 100644
--- a/src/status.coffee
+++ b/src/status.coffee
@@ -3,8 +3,9 @@
 # repo     - A Repo.
 # callback - Receives `(err, status)`
 #
-module.exports = S = (repo, callback) ->
-  repo.git "status --porcelain", (err, stdout, stderr) ->
+module.exports = S = (repo, options, callback) ->
+  console.log options
+  repo.git "status --porcelain", options, (err, stdout, stderr) ->
     status = new Status repo
     status.parse stdout
     return callback err, status
diff --git a/test/fixtures/status_opts/COMMIT_EDITMSG b/test/fixtures/status_opts/COMMIT_EDITMSG
new file mode 100644
index 0000000..e79c5e8
--- /dev/null
+++ b/test/fixtures/status_opts/COMMIT_EDITMSG
@@ -0,0 +1 @@
+initial
diff --git a/test/fixtures/status_opts/HEAD b/test/fixtures/status_opts/HEAD
new file mode 100644
index 0000000..cb089cd
--- /dev/null
+++ b/test/fixtures/status_opts/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/test/fixtures/status_opts/config b/test/fixtures/status_opts/config
new file mode 100644
index 0000000..515f483
--- /dev/null
+++ b/test/fixtures/status_opts/config
@@ -0,0 +1,5 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
diff --git a/test/fixtures/status_opts/description b/test/fixtures/status_opts/description
new file mode 100644
index 0000000..498b267
--- /dev/null
+++ b/test/fixtures/status_opts/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/fixtures/status_opts/hooks/applypatch-msg.sample b/test/fixtures/status_opts/hooks/applypatch-msg.sample
new file mode 100755
index 0000000..8b2a2fe
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/applypatch-msg.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:
diff --git a/test/fixtures/status_opts/hooks/commit-msg.sample b/test/fixtures/status_opts/hooks/commit-msg.sample
new file mode 100755
index 0000000..6ef1d29
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/commit-msg.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by git-commit with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
diff --git a/test/fixtures/status_opts/hooks/post-commit.sample b/test/fixtures/status_opts/hooks/post-commit.sample
new file mode 100755
index 0000000..2266821
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/post-commit.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script that is called after a successful
+# commit is made.
+#
+# To enable this hook, rename this file to "post-commit".
+
+: Nothing
diff --git a/test/fixtures/status_opts/hooks/post-receive.sample b/test/fixtures/status_opts/hooks/post-receive.sample
new file mode 100755
index 0000000..7a83e17
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/post-receive.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script for the "post-receive" event.
+#
+# The "post-receive" script is run after receive-pack has accepted a pack
+# and the repository has been updated.  It is passed arguments in through
+# stdin in the form
+#  <oldrev> <newrev> <refname>
+# For example:
+#  aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
+#
+# see contrib/hooks/ for a sample, or uncomment the next line and
+# rename the file to "post-receive".
+
+#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
diff --git a/test/fixtures/status_opts/hooks/post-update.sample b/test/fixtures/status_opts/hooks/post-update.sample
new file mode 100755
index 0000000..5323b56
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/post-update.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git-update-server-info
diff --git a/test/fixtures/status_opts/hooks/pre-applypatch.sample b/test/fixtures/status_opts/hooks/pre-applypatch.sample
new file mode 100755
index 0000000..b1f187c
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/pre-applypatch.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:
diff --git a/test/fixtures/status_opts/hooks/pre-commit.sample b/test/fixtures/status_opts/hooks/pre-commit.sample
new file mode 100755
index 0000000..439eefd
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/pre-commit.sample
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by git-commit with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git-rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# Cross platform projects tend to avoid non-ascii filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test "$(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0')"
+then
+	echo "Error: Attempt to add a non-ascii file name."
+	echo
+	echo "This can cause problems if you want to work"
+	echo "with people on other platforms."
+	echo
+	echo "To be portable it is advisable to rename the file ..."
+	echo
+	echo "If you know what you are doing you can disable this"
+	echo "check using:"
+	echo
+	echo "  git config hooks.allownonascii true"
+	echo
+	exit 1
+fi
+
+exec git diff-index --check --cached $against --
diff --git a/test/fixtures/status_opts/hooks/pre-rebase.sample b/test/fixtures/status_opts/hooks/pre-rebase.sample
new file mode 100755
index 0000000..be1b06e
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/pre-rebase.sample
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git-rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git-rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git-rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git-rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git-rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git-rev-list --pretty=oneline ^${publish} "$topic"`
+	perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git-rev-list ^master ^topic next
+	git-rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git-rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
diff --git a/test/fixtures/status_opts/hooks/prepare-commit-msg.sample b/test/fixtures/status_opts/hooks/prepare-commit-msg.sample
new file mode 100755
index 0000000..3652424
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/prepare-commit-msg.sample
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by git-commit with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
diff --git a/test/fixtures/status_opts/hooks/update.sample b/test/fixtures/status_opts/hooks/update.sample
new file mode 100755
index 0000000..fd63b2d
--- /dev/null
+++ b/test/fixtures/status_opts/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by git-receive-pack with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git-cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0
diff --git a/test/fixtures/status_opts/index b/test/fixtures/status_opts/index
new file mode 100644
index 0000000..2f33f5c
Binary files /dev/null and b/test/fixtures/status_opts/index differ
diff --git a/test/fixtures/status_opts/info/exclude b/test/fixtures/status_opts/info/exclude
new file mode 100644
index 0000000..2c87b72
--- /dev/null
+++ b/test/fixtures/status_opts/info/exclude
@@ -0,0 +1,6 @@
+# git-ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/test/fixtures/status_opts/logs/HEAD b/test/fixtures/status_opts/logs/HEAD
new file mode 100644
index 0000000..a0a59dc
--- /dev/null
+++ b/test/fixtures/status_opts/logs/HEAD
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 10c14fdc111b6776b1fc3740e8b16939233f7a84 sentientwaffle <sentientwaffle@gmail.com> 1329174405 -0700	commit (initial): initial
diff --git a/test/fixtures/status_opts/logs/refs/heads/master b/test/fixtures/status_opts/logs/refs/heads/master
new file mode 100644
index 0000000..a0a59dc
--- /dev/null
+++ b/test/fixtures/status_opts/logs/refs/heads/master
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 10c14fdc111b6776b1fc3740e8b16939233f7a84 sentientwaffle <sentientwaffle@gmail.com> 1329174405 -0700	commit (initial): initial
diff --git a/test/fixtures/status_opts/npm-debug.log b/test/fixtures/status_opts/npm-debug.log
new file mode 100644
index 0000000..fac3e00
--- /dev/null
+++ b/test/fixtures/status_opts/npm-debug.log
@@ -0,0 +1,17 @@
+0 info it worked if it ends with ok
+1 verbose cli [ 'node', '/usr/local/bin/npm', 'test' ]
+2 info using npm@1.4.23
+3 info using node@v0.10.31
+4 error Error: ENOENT, open '/Users/dbond/src/gift/test/fixtures/status_opts/package.json'
+5 error If you need help, you may report this *entire* log,
+5 error including the npm and node versions, at:
+5 error     <http://github.com/npm/npm/issues>
+6 error System Darwin 12.5.0
+7 error command "node" "/usr/local/bin/npm" "test"
+8 error cwd /Users/dbond/src/gift/test/fixtures/status_opts
+9 error node -v v0.10.31
+10 error npm -v 1.4.23
+11 error path /Users/dbond/src/gift/test/fixtures/status_opts/package.json
+12 error code ENOENT
+13 error errno 34
+14 verbose exit [ 34, true ]
diff --git a/test/fixtures/status_opts/objects/10/c14fdc111b6776b1fc3740e8b16939233f7a84 b/test/fixtures/status_opts/objects/10/c14fdc111b6776b1fc3740e8b16939233f7a84
new file mode 100644
index 0000000..55727a8
Binary files /dev/null and b/test/fixtures/status_opts/objects/10/c14fdc111b6776b1fc3740e8b16939233f7a84 differ
diff --git a/test/fixtures/status_opts/objects/19/0a18037c64c43e6b11489df4bf0b9eb6d2c9bf b/test/fixtures/status_opts/objects/19/0a18037c64c43e6b11489df4bf0b9eb6d2c9bf
new file mode 100644
index 0000000..cd18ee6
Binary files /dev/null and b/test/fixtures/status_opts/objects/19/0a18037c64c43e6b11489df4bf0b9eb6d2c9bf differ
diff --git a/test/fixtures/status_opts/objects/8b/aef1b4abc478178b004d62031cf7fe6db6f903 b/test/fixtures/status_opts/objects/8b/aef1b4abc478178b004d62031cf7fe6db6f903
new file mode 100644
index 0000000..083ead9
Binary files /dev/null and b/test/fixtures/status_opts/objects/8b/aef1b4abc478178b004d62031cf7fe6db6f903 differ
diff --git a/test/fixtures/status_opts/objects/ac/be86c7c89586e0912a0a851bacf309c595c308 b/test/fixtures/status_opts/objects/ac/be86c7c89586e0912a0a851bacf309c595c308
new file mode 100644
index 0000000..c1167c9
Binary files /dev/null and b/test/fixtures/status_opts/objects/ac/be86c7c89586e0912a0a851bacf309c595c308 differ
diff --git a/test/fixtures/status_opts/objects/c8/686e302f5c2f2300767f366cc616e9c464a1bc b/test/fixtures/status_opts/objects/c8/686e302f5c2f2300767f366cc616e9c464a1bc
new file mode 100644
index 0000000..516ef99
Binary files /dev/null and b/test/fixtures/status_opts/objects/c8/686e302f5c2f2300767f366cc616e9c464a1bc differ
diff --git a/test/fixtures/status_opts/objects/d8/b85abf216872cda37b67d8f0c2d1a6fa81a7c3 b/test/fixtures/status_opts/objects/d8/b85abf216872cda37b67d8f0c2d1a6fa81a7c3
new file mode 100644
index 0000000..0fa29f8
Binary files /dev/null and b/test/fixtures/status_opts/objects/d8/b85abf216872cda37b67d8f0c2d1a6fa81a7c3 differ
diff --git a/test/fixtures/status_opts/objects/e6/2415c2695333e16ce6a65eac0b0ade587fd391 b/test/fixtures/status_opts/objects/e6/2415c2695333e16ce6a65eac0b0ade587fd391
new file mode 100644
index 0000000..75b6181
Binary files /dev/null and b/test/fixtures/status_opts/objects/e6/2415c2695333e16ce6a65eac0b0ade587fd391 differ
diff --git a/test/fixtures/status_opts/refs/heads/master b/test/fixtures/status_opts/refs/heads/master
new file mode 100644
index 0000000..23cde39
--- /dev/null
+++ b/test/fixtures/status_opts/refs/heads/master
@@ -0,0 +1 @@
+10c14fdc111b6776b1fc3740e8b16939233f7a84
diff --git a/test/status_opts.test.coffee b/test/status_opts.test.coffee
new file mode 100644
index 0000000..e37dd2a
--- /dev/null
+++ b/test/status_opts.test.coffee
@@ -0,0 +1,86 @@
+should   = require 'should'
+fixtures = require './fixtures'
+git      = require '../src'
+Status   = require '../src/status'
+
+GIT_STATUS = """
+     M cheese.txt
+    D  crackers.txt
+    M  file.txt
+    ?? pickles.txt
+    ?? burger/
+  """
+GIT_STATUS_OPT = """
+     M cheese.txt
+    D  crackers.txt
+    M  file.txt
+    ?? pickles.txt
+    ?? burger/bun.txt
+    ?? burger/patty.txt
+  """
+GIT_STATUS_CLEAN = ""
+GIT_STATUS_NOT_CLEAN = """
+    A  lib/index.js
+     M npm-shrinkwrap.json
+     M package.json
+  """
+
+describe "Status With Options", ->
+  describe "()", ->
+    describe "when there are no changes", ->
+      repo   = fixtures.status_opts
+      status = new Status.Status repo
+      status.parse GIT_STATUS_CLEAN
+
+      it "is clean", ->
+        status.clean.should.be.true
+
+    describe "when there are changes", ->
+      repo   = fixtures.status_opts
+      status = new Status.Status repo
+      status.parse GIT_STATUS_NOT_CLEAN
+      it "is not clean", ->
+        status.clean.should.be.false
+
+    describe "when there are changes", ->
+      repo   = fixtures.status_opts
+      status = new Status.Status repo
+      status.parse GIT_STATUS
+
+      it "has a modified staged file", ->
+        status.files["file.txt"].staged.should.be.true
+        status.files["file.txt"].type.should.eql "M"
+        status.files["file.txt"].tracked.should.be.true
+
+      it "has a modified unstaged file", ->
+        status.files["cheese.txt"].staged.should.be.false
+        status.files["crackers.txt"].type.should.eql "D"
+        status.files["cheese.txt"].type.should.eql "M"
+        status.files["cheese.txt"].tracked.should.be.true
+
+      it "has a deleted file", ->
+        status.files["crackers.txt"].staged.should.be.true
+        status.files["crackers.txt"].type.should.eql "D"
+        status.files["crackers.txt"].tracked.should.be.true
+
+      it "has an untracked file", ->
+        status.files["pickles.txt"].tracked.should.be.false
+        should.not.exist status.files["pickles.txt"].type
+
+      it "has an untracked directory", ->
+        status.files["burger/"].tracked.should.be.false
+        should.not.exist status.files["burger/"].type
+
+      it "is not clean", ->
+        status.clean.should.be.false
+
+    describe "when the -u option is specified", ->
+      repo   = fixtures.status_opts
+      status = new Status.Status repo, "-u"
+      status.parse GIT_STATUS_OPT
+
+      it "lists files in untracked directories", ->
+        status.files["burger/bun.txt"].tracked.should.be.false
+        should.not.exist status.files["burger/bun.txt"].type
+        status.files["burger/patty.txt"].tracked.should.be.false
+        should.not.exist status.files["burger/patty.txt"].type