properly handle a repository with no commits

1 files changed, 12 insertions, 5 deletions

diff --git a/bin/fancy-prompt b/bin/fancy-prompt
index d06403f..4dbc642 100755
--- a/bin/fancy-prompt
+++ b/bin/fancy-prompt
@@ -299,16 +299,23 @@ sub darcs_info {
 sub git_info {
     my ($git_dir) = @_;
 
+    my $HEAD = `git rev-parse --short HEAD 2>/dev/null`;
+
     my $dirty = '';
-    if (system(q[git diff --no-ext-diff --ignore-submodules --quiet --exit-code])) {
-        $dirty .= '*';
+    if ($HEAD) {
+        if (system(q[git diff --no-ext-diff --ignore-submodules --quiet --exit-code])) {
+            $dirty .= '*';
+        }
+        if (system(q[git diff-index --cached --quiet --ignore-submodules HEAD])) {
+            $dirty .= '+';
+        }
     }
-    if (system(q[git diff-index --cached --quiet --ignore-submodules HEAD])) {
-        $dirty .= '+';
+    else {
+        $dirty = '?';
     }
 
     chomp(my $branch = `git symbolic-ref -q HEAD 2>/dev/null`
-                    || `git rev-parse --short HEAD`);
+                    || $HEAD);
     $branch =~ s{^refs/heads/}{};
 
     my $local_commits = '';