wt-status.c:quote_path(): convert empty path to "./"

peff · gitster · commit c3ce3261281d · 2007-12-08T03:33:24.000-08:00
Now that we are correctly removing leading prefixes from files in git
status, there is a degenerate case: the directory matching the prefix.
Because we show only the directory name for a directory that contains
only untracked files, it gets collapsed to an empty string.

Example:

  $ git init
  $ mkdir subdir
  $ touch subdir/file
  $ git status
  ...
  # Untracked files:
  #   (use "git add &lt;file&gt;..." to include in what will be committed)
  #
  #       subdir/

  So far, so good.

  $ cd subdir
  $ git status
  ....
  # Untracked files:
  #   (use "git add &lt;file&gt;..." to include in what will be committed)
  #
  #

  Oops, that's a bit confusing.

  This patch prints './' to show that there is some output.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/wt-status.c b/wt-status.c
@@ -121,6 +121,9 @@ static char *quote_path(const char *in, int len,
 		}
 	}
 
+	if (!out->len)
+		strbuf_addstr(out, "./");
+
 	return out->buf;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ static char quote_path(const char in, int len,`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ if (!out->len)`
	`125`	`+ strbuf_addstr(out, "./");`
	`126`	`+`
`124`	`127`	`return out->buf;`
`125`	`128`	`}`
`126`	`129`