Fossil SCM
Ignore duplicate tags when interpreting git-fast-export text for import.
Commit
355bd99669da65550b311b49c13add25ecf481fd
Parent
49cbf5e519b9c10…
1 file changed
+2
-2
+2
-2
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -148,16 +148,16 @@ | ||
| 148 | 148 | blob_reset(&cmpr); |
| 149 | 149 | rid = db_last_insert_rowid(); |
| 150 | 150 | } |
| 151 | 151 | if( zMark ){ |
| 152 | 152 | db_multi_exec( |
| 153 | - "INSERT INTO xtag(tname, trid, tuuid)" | |
| 153 | + "INSERT OR IGNORE INTO xtag(tname, trid, tuuid)" | |
| 154 | 154 | "VALUES(%Q,%d,%B)", |
| 155 | 155 | zMark, rid, &hash |
| 156 | 156 | ); |
| 157 | 157 | db_multi_exec( |
| 158 | - "INSERT INTO xtag(tname, trid, tuuid)" | |
| 158 | + "INSERT OR IGNORE INTO xtag(tname, trid, tuuid)" | |
| 159 | 159 | "VALUES(%B,%d,%B)", |
| 160 | 160 | &hash, rid, &hash |
| 161 | 161 | ); |
| 162 | 162 | } |
| 163 | 163 | if( saveUuid ){ |
| 164 | 164 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -148,16 +148,16 @@ | |
| 148 | blob_reset(&cmpr); |
| 149 | rid = db_last_insert_rowid(); |
| 150 | } |
| 151 | if( zMark ){ |
| 152 | db_multi_exec( |
| 153 | "INSERT INTO xtag(tname, trid, tuuid)" |
| 154 | "VALUES(%Q,%d,%B)", |
| 155 | zMark, rid, &hash |
| 156 | ); |
| 157 | db_multi_exec( |
| 158 | "INSERT INTO xtag(tname, trid, tuuid)" |
| 159 | "VALUES(%B,%d,%B)", |
| 160 | &hash, rid, &hash |
| 161 | ); |
| 162 | } |
| 163 | if( saveUuid ){ |
| 164 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -148,16 +148,16 @@ | |
| 148 | blob_reset(&cmpr); |
| 149 | rid = db_last_insert_rowid(); |
| 150 | } |
| 151 | if( zMark ){ |
| 152 | db_multi_exec( |
| 153 | "INSERT OR IGNORE INTO xtag(tname, trid, tuuid)" |
| 154 | "VALUES(%Q,%d,%B)", |
| 155 | zMark, rid, &hash |
| 156 | ); |
| 157 | db_multi_exec( |
| 158 | "INSERT OR IGNORE INTO xtag(tname, trid, tuuid)" |
| 159 | "VALUES(%B,%d,%B)", |
| 160 | &hash, rid, &hash |
| 161 | ); |
| 162 | } |
| 163 | if( saveUuid ){ |
| 164 |