The 'newfd' global is useless now as we can just test
for "lock_file == NULL" instead of "newfd < 0".
Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
builtin/apply.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index d26419a..84ff2da 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -141,8 +141,6 @@ struct apply_state {
enum ws_ignore ws_ignore_action;
};
-static int newfd = -1;
-
static const char * const apply_usage[] = {
N_("git apply [<options>] [<patch>...]"),
NULL
@@ -4572,9 +4570,9 @@ static int apply_patch(struct apply_state *state,
state->apply = 0;
state->update_index = state->check_index && state->apply;
- if (state->update_index && newfd < 0) {
+ if (state->update_index && state->lock_file == NULL) {
state->lock_file = xcalloc(1, sizeof(struct lock_file));
- newfd = hold_locked_index(state->lock_file, 1);
+ hold_locked_index(state->lock_file, 1);
}
if (state->check_index) {
--
2.8.1.300.g5fed0c0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html