Fossil SCM

Avoid superfluous variable assignment.

mistachkin 2014-01-16 22:15 trunk
Commit cdab54ed7804117f4ba012aa383c8a7ab48c1dc0
1 file changed +2 -2
+2 -2
--- src/manifest.c
+++ src/manifest.c
@@ -1703,12 +1703,12 @@
17031703
}
17041704
db_begin_transaction();
17051705
if( p->type==CFTYPE_MANIFEST ){
17061706
if( permitHooks ){
17071707
zScript = xfer_commit_code();
1708
+ zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
17081709
}
1709
- zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
17101710
if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
17111711
char *zCom;
17121712
for(i=0; i<p->nParent; i++){
17131713
int pid = uuid_to_rid(p->azParent[i], 1);
17141714
db_multi_exec("INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime)"
@@ -1986,12 +1986,12 @@
19861986
if( db_exists("SELECT 1 FROM event, blob"
19871987
" WHERE event.type='ci' AND event.objid=blob.rid"
19881988
" AND blob.uuid='%s'", zTagUuid) ){
19891989
if( permitHooks ){
19901990
zScript = xfer_commit_code();
1991
+ zUuid = zTagUuid;
19911992
}
1992
- zUuid = zTagUuid;
19931993
}
19941994
}
19951995
zName = p->aTag[i].zName;
19961996
zValue = p->aTag[i].zValue;
19971997
if( strcmp(zName, "*branch")==0 ){
19981998
--- src/manifest.c
+++ src/manifest.c
@@ -1703,12 +1703,12 @@
1703 }
1704 db_begin_transaction();
1705 if( p->type==CFTYPE_MANIFEST ){
1706 if( permitHooks ){
1707 zScript = xfer_commit_code();
 
1708 }
1709 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
1710 if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
1711 char *zCom;
1712 for(i=0; i<p->nParent; i++){
1713 int pid = uuid_to_rid(p->azParent[i], 1);
1714 db_multi_exec("INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime)"
@@ -1986,12 +1986,12 @@
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 }
1992 zUuid = zTagUuid;
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
@@ -1703,12 +1703,12 @@
1703 }
1704 db_begin_transaction();
1705 if( p->type==CFTYPE_MANIFEST ){
1706 if( permitHooks ){
1707 zScript = xfer_commit_code();
1708 zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
1709 }
 
1710 if( !db_exists("SELECT 1 FROM mlink WHERE mid=%d", rid) ){
1711 char *zCom;
1712 for(i=0; i<p->nParent; i++){
1713 int pid = uuid_to_rid(p->azParent[i], 1);
1714 db_multi_exec("INSERT OR IGNORE INTO plink(pid, cid, isprim, mtime)"
@@ -1986,12 +1986,12 @@
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

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button