mirror of
https://github.com/git/git.git
synced 2026-03-27 00:50:11 +01:00
Merge branch 'jc/boundary' into next
* jc/boundary: rev-list --boundary: show boundary commits even when limited otherwise. Makefile fixups. gitk: Fix bug caused by missing commitlisted elements
This commit is contained in:
10
http-push.c
10
http-push.c
@@ -60,12 +60,12 @@ enum XML_Status {
|
||||
#define LOCK_TIME 600
|
||||
#define LOCK_REFRESH 30
|
||||
|
||||
/* bits #0-6 in revision.h */
|
||||
/* bits #0-15 in revision.h */
|
||||
|
||||
#define LOCAL (1u << 7)
|
||||
#define REMOTE (1u << 8)
|
||||
#define FETCHING (1u << 9)
|
||||
#define PUSHING (1u << 10)
|
||||
#define LOCAL (1u<<16)
|
||||
#define REMOTE (1u<<17)
|
||||
#define FETCHING (1u<<18)
|
||||
#define PUSHING (1u<<19)
|
||||
|
||||
/* We allow "recursive" symbolic refs. Only within reason, though */
|
||||
#define MAXDEPTH 5
|
||||
|
||||
Reference in New Issue
Block a user