Fossil SCM
Correct swapped --revision/-r flag handling for the annotate family of commands, as reported in [forum:1673b986fa | forum post 1673b986fa].
Commit
caf60202f790241d352fa84a0eb246c20b20be6ba4a8fadc2450969767f1aaa6
Parent
035b29eccc91602…
1 file changed
+1
-1
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -3771,11 +3771,11 @@ | ||
| 3771 | 3771 | int szHash; /* Display size of a version hash */ |
| 3772 | 3772 | Blob treename; /* Name of file to be annotated */ |
| 3773 | 3773 | char *zFilename; /* Name of file to be annotated */ |
| 3774 | 3774 | |
| 3775 | 3775 | bBlame = g.argv[1][0]!='a'; |
| 3776 | - zRevision = find_option("r","revision",1); | |
| 3776 | + zRevision = find_option("revision","r",1); | |
| 3777 | 3777 | zLimit = find_option("limit","n",1); |
| 3778 | 3778 | zOrig = find_option("origin","o",1); |
| 3779 | 3779 | showLog = find_option("log","l",0)!=0; |
| 3780 | 3780 | if( find_option("ignore-trailing-space","Z",0)!=0 ){ |
| 3781 | 3781 | annFlags = DIFF_IGNORE_EOLWS; |
| 3782 | 3782 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -3771,11 +3771,11 @@ | |
| 3771 | int szHash; /* Display size of a version hash */ |
| 3772 | Blob treename; /* Name of file to be annotated */ |
| 3773 | char *zFilename; /* Name of file to be annotated */ |
| 3774 | |
| 3775 | bBlame = g.argv[1][0]!='a'; |
| 3776 | zRevision = find_option("r","revision",1); |
| 3777 | zLimit = find_option("limit","n",1); |
| 3778 | zOrig = find_option("origin","o",1); |
| 3779 | showLog = find_option("log","l",0)!=0; |
| 3780 | if( find_option("ignore-trailing-space","Z",0)!=0 ){ |
| 3781 | annFlags = DIFF_IGNORE_EOLWS; |
| 3782 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -3771,11 +3771,11 @@ | |
| 3771 | int szHash; /* Display size of a version hash */ |
| 3772 | Blob treename; /* Name of file to be annotated */ |
| 3773 | char *zFilename; /* Name of file to be annotated */ |
| 3774 | |
| 3775 | bBlame = g.argv[1][0]!='a'; |
| 3776 | zRevision = find_option("revision","r",1); |
| 3777 | zLimit = find_option("limit","n",1); |
| 3778 | zOrig = find_option("origin","o",1); |
| 3779 | showLog = find_option("log","l",0)!=0; |
| 3780 | if( find_option("ignore-trailing-space","Z",0)!=0 ){ |
| 3781 | annFlags = DIFF_IGNORE_EOLWS; |
| 3782 |