Merge branch 'tg/refs-allowed-flags'

API error-proofing which happens to also squelch warnings from GCC.

* tg/refs-allowed-flags:
  refs: strip out not allowed flags from ref_transaction_update
This commit is contained in:
Junio C Hamano
2017-09-25 15:24:07 +09:00
2 changed files with 10 additions and 0 deletions

2
refs.c
View File

@ -939,6 +939,8 @@ int ref_transaction_update(struct ref_transaction *transaction,
return -1;
}
flags &= REF_TRANSACTION_UPDATE_ALLOWED_FLAGS;
flags |= (new_sha1 ? REF_HAVE_NEW : 0) | (old_sha1 ? REF_HAVE_OLD : 0);
ref_transaction_add_update(transaction, refname, flags,