[PATCH v2 00/25] Lockfile correctness and refactoring · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 01/25] api-lockfile: expand the documentation · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 01/25] api-lockfile: expand the documentation · Jeff King <hidden> · 2016-06-15
[PATCH v2 02/25] unable_to_lock_die(): rename function from unable_to_lock_index_die() · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 02/25] unable_to_lock_die(): rename function from unable_to_lock_index_die() · Jeff King <hidden> · 2016-06-15
Re: [PATCH v2 02/25] unable_to_lock_die(): rename function from unable_to_lock_index_die() · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 04/25] rollback_lock_file(): set fd to -1 · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 03/25] rollback_lock_file(): do not clear filename redundantly · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 11/25] delete_ref_loose(): don't muck around in the lock_file's filename · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 09/25] lockfile.c: document the various states of lock_file objects · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 05/25] lockfile: unlock file if lockfile permissions cannot be adjusted · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 07/25] lock_file(): always add lock_file object to lock_file_list · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 08/25] struct lock_file: replace on_list field with flags field · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 06/25] hold_lock_file_for_append(): release lock on errors · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 10/25] lockfile: define a constant LOCK_SUFFIX_LEN · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 12/25] prepare_index(): declare return value to be (const char *) · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 15/25] remove_lock_file(): call rollback_lock_file() · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 16/25] commit_lock_file(): inline temporary variable · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 24/25] resolve_symlink(): take a strbuf parameter · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 18/25] lockfile: avoid transitory invalid states · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 18/25] lockfile: avoid transitory invalid states · Johannes Sixt <hidden> · 2016-06-15
Re: [PATCH v2 18/25] lockfile: avoid transitory invalid states · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 18/25] lockfile: avoid transitory invalid states · Johannes Sixt <hidden> · 2016-06-15
Re: [PATCH v2 18/25] lockfile: avoid transitory invalid states · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 18/25] lockfile: avoid transitory invalid states · Jeff King <hidden> · 2016-06-15
[PATCH v2 25/25] trim_last_path_elm(): replace last_path_elm() · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 20/25] try_merge_strategy(): use a statically-allocated lock_file object · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 23/25] resolve_symlink(): use a strbuf for internal scratch space · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 22/25] Change lock_file::filename into a strbuf · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 14/25] lock_file(): exit early if lockfile cannot be opened · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 17/25] commit_lock_file(): make committing an unlocked lockfile a NOP · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 17/25] commit_lock_file(): make committing an unlocked lockfile a NOP · Jeff King <hidden> · 2016-06-15
Re: [PATCH v2 17/25] commit_lock_file(): make committing an unlocked lockfile a NOP · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 13/25] write_packed_entry_fn(): convert cb_data into a (const int *) · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 21/25] commit_lock_file(): use a strbuf to manage temporary space · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 19/25] try_merge_strategy(): remove redundant lock_file allocation · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 00/25] Lockfile correctness and refactoring · Jeff King <hidden> · 2016-06-15

Re: [PATCH v2 02/25] unable_to_lock_die(): rename function from unable_to_lock_index_die()

From: Michael Haggerty <hidden>
Date: 2016-06-15 23:00:39

On 04/07/2014 08:47 PM, Jeff King wrote:

On Mon, Apr 07, 2014 at 01:33:44AM +0200, Michael Haggerty wrote:

quoted

This function is used for other things besides the index, so rename it
accordingly.

Oh, and here it is. I should really have just read ahead before
responding to patch 1.

We can either re-order these first two, or just not worry about it.

Thanks for catching this.  Yes, swapping the first two patches solves
the problem and doesn't conflict.

Michael

-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help