wt-status: Teach how to discard changes in the working directory

This is a question that comes up a lot in #git.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7502-status.sh b/t/t7502-status.sh
index c8e4c2e7b452c5e8db3958a85195c8cc5f6918f5..1905fb34cd222aa9443d28fd673b0cc9e02f3335 100755 (executable)
--- a/t/t7502-status.sh
+++ b/t/t7502-status.sh
@@ -46,6 +46,7 @@ cat > expect << \EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #


@@ -76,6 +77,7 @@ cat >expect <<EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #


@@ -104,6 +106,7 @@ cat >expect <<EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #


@@ -138,6 +141,7 @@ cat >expect <<EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #


@@ -174,6 +178,7 @@ cat > expect << \EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   modified
 #
 #
 #      modified:   modified
 #


@@ -204,6 +209,7 @@ cat > expect << \EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #


@@ -267,6 +273,7 @@ cat >expect <<EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #


@@ -297,6 +304,7 @@ cat >expect <<EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #


@@ -326,6 +334,7 @@ cat >expect <<EOF
 # On branch master
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 # On branch master
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #


@@ -357,6 +366,7 @@ cat >expect <<EOF
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)
 #
 # Changed but not updated:
 #   (use "git add <file>..." to update what will be committed)

+#   (use "git checkout -- <file>..." to discard changes in working directory)

 #
 #      modified:   dir1/modified
 #
 #
 #      modified:   dir1/modified
 #

diff --git a/wt-status.c b/wt-status.c
index 23702a25c45a354cb846c7e79c88a6cdd704b080..7cf890f2433bf622fe8c18faa0b0c89be60ef1db 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -79,6 +79,7 @@ static void wt_status_print_dirty_header(struct wt_status *s,
                color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to update what will be committed)");
        else
                color_fprintf_ln(s->fp, c, "#   (use \"git add/rm <file>...\" to update what will be committed)");
                color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to update what will be committed)");
        else
                color_fprintf_ln(s->fp, c, "#   (use \"git add/rm <file>...\" to update what will be committed)");

+       color_fprintf_ln(s->fp, c, "#   (use \"git checkout -- <file>...\" to discard changes in working directory)");

        color_fprintf_ln(s->fp, c, "#");
 }
 
        color_fprintf_ln(s->fp, c, "#");
 }