Fossil SCM
Fix "fossil stash diff --tk"
Commit
1b0a259301bb19ead1262e98b804282434b71ffe
Parent
f92d80d42a823b0…
1 file changed
+1
+1
| --- src/stash.c | ||
| +++ src/stash.c | ||
| @@ -639,10 +639,11 @@ | ||
| 639 | 639 | } |
| 640 | 640 | if( find_option("internal","i",0)==0 ){ |
| 641 | 641 | zDiffCmd = diff_command_external(0); |
| 642 | 642 | } |
| 643 | 643 | diffFlags = diff_options(); |
| 644 | + if( find_option("verbose","v",0)!=0 ) diffFlags |= DIFF_VERBOSE; | |
| 644 | 645 | if( g.argc>4 ) usage(mprintf("%s STASHID", zCmd)); |
| 645 | 646 | if( zDiffCmd ){ |
| 646 | 647 | zBinGlob = diff_get_binary_glob(); |
| 647 | 648 | fIncludeBinary = diff_include_binary_files(); |
| 648 | 649 | } |
| 649 | 650 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -639,10 +639,11 @@ | |
| 639 | } |
| 640 | if( find_option("internal","i",0)==0 ){ |
| 641 | zDiffCmd = diff_command_external(0); |
| 642 | } |
| 643 | diffFlags = diff_options(); |
| 644 | if( g.argc>4 ) usage(mprintf("%s STASHID", zCmd)); |
| 645 | if( zDiffCmd ){ |
| 646 | zBinGlob = diff_get_binary_glob(); |
| 647 | fIncludeBinary = diff_include_binary_files(); |
| 648 | } |
| 649 |
| --- src/stash.c | |
| +++ src/stash.c | |
| @@ -639,10 +639,11 @@ | |
| 639 | } |
| 640 | if( find_option("internal","i",0)==0 ){ |
| 641 | zDiffCmd = diff_command_external(0); |
| 642 | } |
| 643 | diffFlags = diff_options(); |
| 644 | if( find_option("verbose","v",0)!=0 ) diffFlags |= DIFF_VERBOSE; |
| 645 | if( g.argc>4 ) usage(mprintf("%s STASHID", zCmd)); |
| 646 | if( zDiffCmd ){ |
| 647 | zBinGlob = diff_get_binary_glob(); |
| 648 | fIncludeBinary = diff_include_binary_files(); |
| 649 | } |
| 650 |