summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortummychow <tummychow@users.noreply.github.com>2018-03-11 16:54:51 -0700
committertummychow <tummychow@users.noreply.github.com>2018-03-11 16:54:51 -0700
commit6a28144fc141e44acef05ada3d30249573d04ae2 (patch)
tree677886ff3cc0026d4dea02b700c0302b11e7b3f3
parent1253f2029a1642f2767f40e098582c0994152743 (diff)
rename base in stack
-rw-r--r--src/stack.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/stack.rs b/src/stack.rs
index 5aa708a..e8faa77 100644
--- a/src/stack.rs
+++ b/src/stack.rs
@@ -16,7 +16,7 @@ fn max_stack(repo: &git2::Repository) -> usize {
pub fn working_stack<'repo>(
repo: &'repo git2::Repository,
- custom_base: Option<&git2::Commit<'repo>>,
+ base: Option<&git2::Commit<'repo>>,
logger: &slog::Logger,
) -> Result<Vec<git2::Commit<'repo>>, failure::Error> {
let head = repo.head()?;
@@ -31,9 +31,9 @@ pub fn working_stack<'repo>(
revwalk.push_head()?;
debug!(logger, "head pushed"; "head" => head.name());
- if let Some(base_commit) = custom_base {
- revwalk.hide(base_commit.id())?;
- debug!(logger, "commit hidden"; "commit" => base_commit.id().to_string());
+ if let Some(base) = base {
+ revwalk.hide(base.id())?;
+ debug!(logger, "commit hidden"; "commit" => base.id().to_string());
} else {
for branch in repo.branches(Some(git2::BranchType::Local))? {
let (branch, _) = branch?;