Commit Diff

Commit:
fb9704afe0e40de783660e26d5498278a47affca
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
do not display unversioned files during 'got revert -R'
Actions:
Patch | Tree
commit - bded54978e6b0855974c75ddea54ebe2529f0560
commit + fb9704afe0e40de783660e26d5498278a47affca
blob - 6b7a4b54db79905db7ddafca3be7bf1b07b8a978
blob + b44f1a8266e09cb7ab0806030e978d068372354f
--- got/got.c
+++ got/got.c
@@ -4345,6 +4345,9 @@ usage_revert(void)
 static const struct got_error *
 revert_progress(void *arg, unsigned char status, const char *path)
 {
+	if (status == GOT_STATUS_UNVERSIONED)
+		return NULL;
+
 	while (path[0] == '/')
 		path++;
 	printf("%c  %s\n", status, path);
blob - 6e6d96b664048db5f46c4c4ac8afba5899c30910
blob + 82051ede6d882daed8f787c0125cfb01f1fc71d8
--- regress/cmdline/revert.sh
+++ regress/cmdline/revert.sh
@@ -337,7 +337,6 @@ function test_revert_directory_unknown {
 	(cd $testroot/wt && got revert -R . > $testroot/stdout)
 
 	echo 'R  alpha' > $testroot/stdout.expected
-	echo '?  epsilon/new_file' >> $testroot/stdout.expected
 	echo 'R  epsilon/zeta' >> $testroot/stdout.expected
 	cmp -s $testroot/stdout.expected $testroot/stdout
 	ret="$?"