Differences From Artifact [63cef80d37]:

• File src/stash.c — part of check-in [85a7d82e94] at 2024-05-02 10:03:41 on branch trunk — When (stash save) is given no valid file names, fail loudly rather than silently, as the latter emits only a message about an uncommitted transaction. Reported in [forum:747f0c32aa]. (user: stephan size: 26313) [more...]

To Artifact [30d159663e]:

• File src/stash.c — part of check-in [5bec7a698e] at 2025-03-17 16:31:15 on branch trunk — If the gdiff-command setting is undefined and if "tclsh" and "wish" are on PATH, then the various "gdiff" commands always try to use --tk as the graphical diff, rather than searching for an external diff program. (user: drh size: 26345) [more...]

754
755
756
757
758
759
760
761
762
763
764
765
766
767
768

  ){
    int fBaseline = 0;
    DiffConfig DCfg;

    if( strstr(zCmd,"show")!=0 || strstr(zCmd,"cat")!=0 ){
      fBaseline = 1;
    }
    if( find_option("tk",0,0)!=0 ){
      db_close(0);
      diff_tk(fBaseline ? "stash show" : "stash diff", 3);
      return;
    }
    diff_options(&DCfg, zCmd[0]=='g', 0);
    stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
    stash_diff(stashid, fBaseline, &DCfg);

|

754
755
756
757
758
759
760
761
762
763
764
765
766
767
768

  ){
    int fBaseline = 0;
    DiffConfig DCfg;

    if( strstr(zCmd,"show")!=0 || strstr(zCmd,"cat")!=0 ){
      fBaseline = 1;
    }
    if( find_option("tk",0,0)!=0 || gdiff_using_tk(zCmd[0]=='g') ){
      db_close(0);
      diff_tk(fBaseline ? "stash show" : "stash diff", 3);
      return;
    }
    diff_options(&DCfg, zCmd[0]=='g', 0);
    stashid = stash_get_id(g.argc==4 ? g.argv[3] : 0);
    stash_diff(stashid, fBaseline, &DCfg);