Fossil SCM
Add extra check in git_fast_import() so that 'import --git --incremental' queries the new table if it exists in the repository database to attribute check-ins.
Commit
8eeba7a8db0e8c3b220d9aa115ee199cf826795b8bbe036535939aa6da07eedc
Parent
dd15d28d89d472a…
1 file changed
+1
-1
+1
-1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -687,11 +687,11 @@ | ||
| 687 | 687 | if ( (z=strchr(z, '<'))==NULL ) goto malformed_line; |
| 688 | 688 | z++; |
| 689 | 689 | *(zTo-1) = '\0'; |
| 690 | 690 | gg.zUser = fossil_strdup(z); |
| 691 | 691 | } |
| 692 | - if (ggit.nGitAttr > 0) { | |
| 692 | + if (ggit.nGitAttr > 0 || db_table_exists("repository", "fx_git")) { | |
| 693 | 693 | gg.zUser = db_text(gg.zUser, |
| 694 | 694 | "SELECT user FROM fx_git WHERE email=%Q", z); |
| 695 | 695 | } |
| 696 | 696 | secSince1970 = 0; |
| 697 | 697 | for(zTo++; fossil_isdigit(*zTo); zTo++){ |
| 698 | 698 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -687,11 +687,11 @@ | |
| 687 | if ( (z=strchr(z, '<'))==NULL ) goto malformed_line; |
| 688 | z++; |
| 689 | *(zTo-1) = '\0'; |
| 690 | gg.zUser = fossil_strdup(z); |
| 691 | } |
| 692 | if (ggit.nGitAttr > 0) { |
| 693 | gg.zUser = db_text(gg.zUser, |
| 694 | "SELECT user FROM fx_git WHERE email=%Q", z); |
| 695 | } |
| 696 | secSince1970 = 0; |
| 697 | for(zTo++; fossil_isdigit(*zTo); zTo++){ |
| 698 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -687,11 +687,11 @@ | |
| 687 | if ( (z=strchr(z, '<'))==NULL ) goto malformed_line; |
| 688 | z++; |
| 689 | *(zTo-1) = '\0'; |
| 690 | gg.zUser = fossil_strdup(z); |
| 691 | } |
| 692 | if (ggit.nGitAttr > 0 || db_table_exists("repository", "fx_git")) { |
| 693 | gg.zUser = db_text(gg.zUser, |
| 694 | "SELECT user FROM fx_git WHERE email=%Q", z); |
| 695 | } |
| 696 | secSince1970 = 0; |
| 697 | for(zTo++; fossil_isdigit(*zTo); zTo++){ |
| 698 |