Revision 41dd4ffaf99532d8344c90a5b1a060ac1f73b232 authored by Michael Haggerty on 01 October 2014, 10:28:11 UTC, committed by Junio C Hamano on 01 October 2014, 20:38:41 UTC
If the call to adjust_shared_perm() fails, lock_file returns -1, which to the caller looks like any other failure to lock the file. So in this case, roll back the lockfile before returning so that the lock file is deleted immediately and the lockfile object is left in a predictable state (namely, unlocked). Previously, the lockfile was retained until process cleanup in this situation. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 26f5d3b
mailmap.h
#ifndef MAILMAP_H
#define MAILMAP_H
int read_mailmap(struct string_list *map, char **repo_abbrev);
void clear_mailmap(struct string_list *map);
int map_user(struct string_list *map,
const char **email, size_t *emaillen, const char **name, size_t *namelen);
#endif
Computing file changes ...
