diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2013-08-03 13:51:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 11:32:19 -0700 |
| commit | f90220755064c74e1e98d49814cb93a4ce0d0ca1 (patch) | |
| tree | 67b9499c0a3bcb1586182b4f2c7a13c9e4d9f9fa | |
| parent | b7df098c6db078f60ac8f8e07ac0c5e320b7a86c (diff) | |
| download | git-f90220755064c74e1e98d49814cb93a4ce0d0ca1.tar.gz | |
checkout: remove superfluous local variable
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/checkout.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 8b48f4adbc..ed39cecf9a 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -228,8 +228,6 @@ static int checkout_paths(const struct checkout_opts *opts, int flag; struct commit *head; int errs = 0; - int stage = opts->writeout_stage; - int merge = opts->merge; int newfd; struct lock_file *lock_file; @@ -327,8 +325,8 @@ static int checkout_paths(const struct checkout_opts *opts, continue; if (opts->force) { warning(_("path '%s' is unmerged"), ce->name); - } else if (stage) { - errs |= check_stage(stage, ce, pos); + } else if (opts->writeout_stage) { + errs |= check_stage(opts->writeout_stage, ce, pos); } else if (opts->merge) { errs |= check_stages((1<<2) | (1<<3), ce, pos); } else { @@ -352,9 +350,9 @@ static int checkout_paths(const struct checkout_opts *opts, errs |= checkout_entry(ce, &state, NULL); continue; } - if (stage) - errs |= checkout_stage(stage, ce, pos, &state); - else if (merge) + if (opts->writeout_stage) + errs |= checkout_stage(opts->writeout_stage, ce, pos, &state); + else if (opts->merge) errs |= checkout_merged(pos, &state); pos = skip_same_name(ce, pos) - 1; } |