Re: [PATCH v3 2/3] refs.c: split delete_ref_loose() into a separate flag-for-deletion and commit phase

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 11, 2014, 21:51 UTC
Message-ID: <xmqqa9brr0uy.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1397248790-10403-3-git-send-email-sahlberg@google.com>

Ronnie Sahlberg <sahlberg@google.com> writes:

Show 17 quoted lines

>  int commit_ref_lock(struct ref_lock *lock)
>  {
> +	if (lock->delete_ref) {
> +		int flag = lock->delete_flag;
> +
> +		if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
> +			/* loose */
> +			int err, i = strlen(lock->lk->filename) - 5; /* .lock */
> +
> +			lock->lk->filename[i] = 0;
> +			err = unlink_or_warn(lock->lk->filename);
> +			lock->lk->filename[i] = '.';
> +			if (err && errno != ENOENT)
> +				return 1;
> +		}
> +	} else
>          if (!lock->skipped_write && commit_ref(lock)) {

	} else if (...) {

Also the previous patch indents the above "if" line in the context with spaces; please use a tab.