Commit Diff

Commit:
6e1eade5c833f34c20301fd61b720268525270f8
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
fix 'got revert' progress output for symlinks
Actions:
Patch | Tree
commit - 3b9f0f87ff620ce7d6ad75195b0c67425bc96ab7
commit + 6e1eade5c833f34c20301fd61b720268525270f8
blob - 40f832a405d94d9b628752ef3ed637eeba54faf5
blob + b98e8e7cdc08c10c83d384f9f6b6ceb507ab07b3
--- lib/worktree.c
+++ lib/worktree.c
@@ -1365,7 +1365,9 @@ install_symlink(int *is_bad_symlink, struct got_worktr
 				goto done;
 			if (progress_cb) {
 				err = (*progress_cb)(progress_arg,
-				    GOT_STATUS_UPDATE, path);
+				    reverting_versioned_file ?
+				    GOT_STATUS_REVERT : GOT_STATUS_UPDATE,
+				    path);
 			}
 			goto done; /* Nothing else to do. */
 		}
@@ -1408,7 +1410,8 @@ install_symlink(int *is_bad_symlink, struct got_worktr
 			    target_path, ondisk_path);
 		}
 	} else if (progress_cb)
-		err = (*progress_cb)(progress_arg, GOT_STATUS_ADD, path);
+		err = (*progress_cb)(progress_arg, reverting_versioned_file ?
+		    GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
 done:
 	free(resolved_path);
 	free(abspath);