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

Merge branch 'jc/maint-co-track'

Browse Source 
* jc/maint-co-track:
  Enhance hold_lock_file_for_{update,append}() API
  demonstrate breakage of detached checkout with symbolic link HEAD
  Fix "checkout --track -b newbranch" on detached HEAD

Conflicts:
	builtin-commit.c
This commit is contained in:
Junio C Hamano
2008-10-21 17:58:11 -07:00
parent 6af50f7536 acd3b9eca8
commit a157400c97
12 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -423,6 +423,8 @@ struct lock_file {
char on_list;
char filename[PATH_MAX];
};
#define LOCK_DIE_ON_ERROR 1
#define LOCK_NODEREF 2
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
extern int commit_lock_file(struct lock_file *);