diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2016-04-24 10:48:26 +0300 |
|---|---|---|
| committer | Michael Haggerty <mhagger@alum.mit.edu> | 2016-06-13 12:23:49 +0300 |
| commit | c52ce248d63a185eb0a616b361d1fd72c5c66451 (patch) | |
| tree | 035bec75e98005be432d414db665abdac2e25be0 /refs/files-backend.c | |
| parent | 0568c8e9dce2aa0dd18f41f23e3465f3639e371e (diff) | |
ref_transaction_create(): disallow recursive pruning
It is nonsensical (and a little bit dangerous) to use REF_ISPRUNING
without REF_NODEREF. Forbid it explicitly. Change the one REF_ISPRUNING
caller to pass REF_NODEREF too.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Diffstat (limited to 'refs/files-backend.c')
| -rw-r--r-- | refs/files-backend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index c978fe49c9..35d37ce58b 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -2087,7 +2087,7 @@ static void prune_ref(struct ref_to_prune *r) transaction = ref_transaction_begin(&err); if (!transaction || ref_transaction_delete(transaction, r->name, r->sha1, - REF_ISPRUNING, NULL, &err) || + REF_ISPRUNING | REF_NODEREF, NULL, &err) || ref_transaction_commit(transaction, &err)) { ref_transaction_free(transaction); error("%s", err.buf); |