git-p4: Ensure the working directory and the index are clean before "git-p4 rebase"

diff --git a/environment.c b/environment.c
index 2fbbc8e430cb6cd331f6835e07ede7c1e7d2a45a..18a1c4eec49bfddcb81d6669c83f8f97a218d7bf 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -31,9 +31,9 @@ size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE;
 size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT;
 size_t delta_base_cache_limit = 16 * 1024 * 1024;
 char *pager_program;
-int pager_in_use;
 int pager_use_color = 1;
 char *editor_program;
+char *excludes_file;
 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;