Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fish-shell/fish-shell
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: fish-shell/fish-shell
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: Integration_4.0.8
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 7 files changed
  • 1 contributor

Commits on Sep 13, 2025

  1. build_tools/release.sh: fixes for updating fish-site

    Also check that "cd fish-site && make && make new-release" doesn't
    leave behind untracked files we're not aware of.  This implies that
    this script ought to refuse to run if there are untracked files,
    at least in fish-site.
    
    (cherry picked from commit 529f722)
    krobelus committed Sep 13, 2025
    Configuration menu
    Copy the full SHA
    23c25ff View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2025

  1. Fix new-style bindings shadowing raw escape sequence bindings

    Given
    
    	bind up "echo user up, new notation"
    	bind \e\[A "echo user up, legacy notation"
    
    prior to b9d9e7e (Match bindings with explicit shift
    first, 2025-05-24), we prioritized the legacy notation because
    input_mapping_insert_sorted() makes us try longer sequences first --
    and "up" is only one key compared to the three-key legacy sequence.
    
    This prioritization was broken in b9d9e7e, causing plugins that
    update to the "bind up" notation to break users who haven't (#11803).
    
    Even worse, it caused preset bindings to shadow user ones:
    
    	bind --preset up "echo preset up, new notation"
    	bind \e\[A "echo user up, legacy notation"
    
    Restore backwards compatibility by treating matches against legacy
    notation like exact matches again.
    
    (cherry picked from commit 9a04c15)
    krobelus committed Sep 18, 2025
    Configuration menu
    Copy the full SHA
    7783505 View commit details
    Browse the repository at this point in the history
  2. build_tools/release.sh: push to the integration branch when all goes …

    …well
    
    Also, ignore any "sendemail.to" Git config, and remove a temporary
    statement in release notes.
    
    (cherry picked from commit 3456b33)
    krobelus committed Sep 18, 2025
    Configuration menu
    Copy the full SHA
    3b8780a View commit details
    Browse the repository at this point in the history
  3. build_tools/release.sh: relax assertion about changelog title

    I'd like to move to a process where everything goes into master first,
    and then flows downstream to any release branches (i.e. no merging
    of Integration_* branches back into master).
    
    The only thing we need to change for that is to add release notes for
    patch releases eagerly on master.  That implies that we want to use
    the actual version instead of ???.  (Only if something goes wrong
    in the release process, we need to change this on both branches,
    but that should happen too often.)
    
    (cherry picked from commit 1840df9)
    krobelus committed Sep 18, 2025
    Configuration menu
    Copy the full SHA
    861decb View commit details
    Browse the repository at this point in the history
  4. github release workflow: work around trailing "---"-line in changelog

    The extracted release notes trigger a sphinx warning
    
    	/tmp/tmp.V6RGP92nc2/src/index.rst:6:Document may not end with a transition.
    
    which we don't seem to get on the full CHANGELOG.rst.
    Let's work around that for now.
    
    (cherry picked from commit 0d46c26)
    krobelus committed Sep 18, 2025
    Configuration menu
    Copy the full SHA
    553612f View commit details
    Browse the repository at this point in the history
  5. Release 4.0.8

    Created by ./build_tools/release.sh 4.0.8
    krobelus committed Sep 18, 2025
    Configuration menu
    Copy the full SHA
    b1ec703 View commit details
    Browse the repository at this point in the history
Loading