mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into js/c-merge-recursive

Browse Source 
Adjust to hold_lock_file_for_update() change on the master.
This commit is contained in:
Junio C Hamano
2006-08-12 18:34:36 -07:00
parent 4147d801db 01aaf1f88d
commit eed94a570e
84 changed files with 1487 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cache.h
View File

@ -176,7 +176,7 @@ struct lock_file {
struct lock_file *next;
char filename[PATH_MAX];
};
extern int hold_lock_file_for_update(struct lock_file *, const char *path);
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
extern int commit_lock_file(struct lock_file *);
extern void rollback_lock_file(struct lock_file *);
@ -387,6 +387,7 @@ extern int receive_keep_pack(int fd[2], const char *me, int quiet, int);
/* pager.c */
extern void setup_pager(void);
extern int pager_in_use;
extern int pager_use_color;
/* base85 */
int decode_85(char *dst, char *line, int linelen);