Fossil SCM
No need to do a 'ci'-check when permitHooks is false anyway.
Commit
bed113ca3fb1d89426a38d23c2996369746bf29b
Parent
0647dd38b853e3c…
1 file changed
+3
-5
+3
-5
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1981,17 +1981,15 @@ | ||
| 1981 | 1981 | if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){ |
| 1982 | 1982 | blob_appendf(&comment, |
| 1983 | 1983 | " Edit [%S]:", |
| 1984 | 1984 | zTagUuid); |
| 1985 | 1985 | branchMove = 0; |
| 1986 | - if( db_exists("SELECT 1 FROM event, blob" | |
| 1986 | + if( permitHooks && db_exists("SELECT 1 FROM event, blob" | |
| 1987 | 1987 | " WHERE event.type='ci' AND event.objid=blob.rid" |
| 1988 | 1988 | " AND blob.uuid='%s'", zTagUuid) ){ |
| 1989 | - if( permitHooks ){ | |
| 1990 | - zScript = xfer_commit_code(); | |
| 1991 | - zUuid = zTagUuid; | |
| 1992 | - } | |
| 1989 | + zScript = xfer_commit_code(); | |
| 1990 | + zUuid = zTagUuid; | |
| 1993 | 1991 | } |
| 1994 | 1992 | } |
| 1995 | 1993 | zName = p->aTag[i].zName; |
| 1996 | 1994 | zValue = p->aTag[i].zValue; |
| 1997 | 1995 | if( strcmp(zName, "*branch")==0 ){ |
| 1998 | 1996 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1981,17 +1981,15 @@ | |
| 1981 | if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){ |
| 1982 | blob_appendf(&comment, |
| 1983 | " Edit [%S]:", |
| 1984 | zTagUuid); |
| 1985 | branchMove = 0; |
| 1986 | if( db_exists("SELECT 1 FROM event, blob" |
| 1987 | " WHERE event.type='ci' AND event.objid=blob.rid" |
| 1988 | " AND blob.uuid='%s'", zTagUuid) ){ |
| 1989 | if( permitHooks ){ |
| 1990 | zScript = xfer_commit_code(); |
| 1991 | zUuid = zTagUuid; |
| 1992 | } |
| 1993 | } |
| 1994 | } |
| 1995 | zName = p->aTag[i].zName; |
| 1996 | zValue = p->aTag[i].zValue; |
| 1997 | if( strcmp(zName, "*branch")==0 ){ |
| 1998 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1981,17 +1981,15 @@ | |
| 1981 | if( i==0 || fossil_strcmp(zTagUuid, p->aTag[i-1].zUuid)!=0 ){ |
| 1982 | blob_appendf(&comment, |
| 1983 | " Edit [%S]:", |
| 1984 | zTagUuid); |
| 1985 | branchMove = 0; |
| 1986 | if( permitHooks && db_exists("SELECT 1 FROM event, blob" |
| 1987 | " WHERE event.type='ci' AND event.objid=blob.rid" |
| 1988 | " AND blob.uuid='%s'", zTagUuid) ){ |
| 1989 | zScript = xfer_commit_code(); |
| 1990 | zUuid = zTagUuid; |
| 1991 | } |
| 1992 | } |
| 1993 | zName = p->aTag[i].zName; |
| 1994 | zValue = p->aTag[i].zValue; |
| 1995 | if( strcmp(zName, "*branch")==0 ){ |
| 1996 |