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: git/git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c43136d67b7c6a9ecfa988004eb4a87bfbe957a0
Choose a base ref
...
head repository: git/git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8ccc75c2452b5814d2445d60d54266293ca48674
Choose a head ref
  • 6 commits
  • 113 files changed
  • 2 contributors

Commits on Dec 12, 2024

  1. Merge branch 'ps/build' into ps/3.0-remote-deprecation

    * ps/build: (24 commits)
      Introduce support for the Meson build system
      Documentation: add comparison of build systems
      t: allow overriding build dir
      t: better support for out-of-tree builds
      Documentation: extract script to generate a list of mergetools
      Documentation: teach "cmd-list.perl" about out-of-tree builds
      Documentation: allow sourcing generated includes from separate dir
      Makefile: simplify building of templates
      Makefile: write absolute program path into bin-wrappers
      Makefile: allow "bin-wrappers/" directory to exist
      Makefile: refactor generators to be PWD-independent
      Makefile: extract script to generate gitweb.js
      Makefile: extract script to generate gitweb.cgi
      Makefile: extract script to massage Python scripts
      Makefile: extract script to massage Shell scripts
      Makefile: use "generate-perl.sh" to massage Perl library
      Makefile: extract script to massage Perl scripts
      Makefile: consistently use PERL_PATH
      Makefile: generate doc versions via GIT-VERSION-GEN
      Makefile: generate "git.rc" via GIT-VERSION-GEN
      ...
    gitster committed Dec 12, 2024
    Configuration menu
    Copy the full SHA
    2187ce7 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2025

  1. Makefile: wire up build option for deprecated features

    With 57ec925 (docs: introduce document to announce breaking changes,
    2024-06-14), we have introduced a new document that tracks upcoming
    breaking changes in the Git project. In 2454970 (BreakingChanges:
    early adopter option, 2024-10-11) we have amended the document a bit to
    mention that any introduced breaking changes must be accompanied by
    logic that allows us to enable the breaking change at compile-time.
    While we already have two breaking changes lined up, neither of them has
    such a switch because they predate those instructions.
    
    Introduce the proposed `WITH_BREAKING_CHANGES` preprocessor macro and
    wire it up with both our Makefiles and Meson. This does not yet wire up
    the build flag for existing deprecations.
    
    Signed-off-by: Patrick Steinhardt <[email protected]>
    Signed-off-by: Junio C Hamano <[email protected]>
    pks-t authored and gitster committed Jan 22, 2025
    Configuration menu
    Copy the full SHA
    c5bc9a7 View commit details
    Browse the repository at this point in the history
  2. ci: merge linux-gcc-default into linux-gcc

    The "linux-gcc-default" job is mostly doing the same as the "linux-gcc"
    job, except for a couple of minor differences:
    
      - We use an explicit GCC version instead of the default version
        provided by the distribution. We have other jobs that test with
        "gcc-8", making this distinction pointless.
    
      - We don't set up the Python version explicitly, and instead use the
        default Python version. Python 2 has been end-of-life for quite a
        while now though, making this distinction less interesting.
    
      - We set up the default branch name to be "main" in "linux-gcc". We
        have other testcases that don't and also some that explicitly use
        "master".
    
      - We use "ubuntu:20.04" in one job and "ubuntu:latest" in another. We
        already have a couple other jobs testing these respectively.
    
    So overall, the job does not add much to our test coverage.
    
    Drop the "linux-gcc-default" job and adapt "linux-gcc" to start using
    the default GCC compiler, effectively merging those two jobs into one.
    
    Signed-off-by: Patrick Steinhardt <[email protected]>
    Signed-off-by: Junio C Hamano <[email protected]>
    pks-t authored and gitster committed Jan 22, 2025
    Configuration menu
    Copy the full SHA
    04c29bd View commit details
    Browse the repository at this point in the history
  3. ci: repurpose "linux-gcc" job for deprecations

    The "linux-gcc" job isn't all that interesting by itself and can be
    considered more or less the "standard" job: it is running with a
    reasonably up-to-date image and uses GCC as a compiler, both of which we
    already cover in other jobs.
    
    There is one exception though: we change the default branch to be "main"
    instead of "master", so it is forging ahead a bit into the future to
    make sure that this change does not cause havoc. So let's expand on this
    a bit and also add the new "WITH_BREAKING_CHANGES" flag to the mix.
    
    Rename the job to "linux-breaking-changes" accordingly.
    
    Signed-off-by: Patrick Steinhardt <[email protected]>
    Signed-off-by: Junio C Hamano <[email protected]>
    pks-t authored and gitster committed Jan 22, 2025
    Configuration menu
    Copy the full SHA
    4b5073c View commit details
    Browse the repository at this point in the history
  4. builtin/pack-redundant: remove subcommand with breaking changes

    The git-pack-redundant(1) subcommand has been castrated to require
    the "--i-still-use-this" option to do anything since 4406522
    (pack-redundant: escalate deprecation warning to an error,
    2023-03-23), which appeared in Git 2.41 and was announced for
    removal with 53a92c9 (Documentation/BreakingChanges: announce
    removal of git-pack-redundant(1), 2024-09-02). Stop compiling the
    subcommand in case the `WITH_BREAKING_CHANGES` build flag is set.
    
    Signed-off-by: Patrick Steinhardt <[email protected]>
    Signed-off-by: Junio C Hamano <[email protected]>
    pks-t authored and gitster committed Jan 22, 2025
    Configuration menu
    Copy the full SHA
    68f5187 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2025

  1. remote: announce removal of "branches/" and "remotes/"

    Back when Git was in its infancy, remotes were configured via separate
    files in "branches/" (back in 2005). This mechanism was replaced later
    that year with the "remotes/" directory. Both mechanisms have eventually
    been replaced by config-based remotes, and it is very unlikely that
    anybody still uses these directories to configure their remotes.
    
    Both of these directories have been marked as deprecated, one in 2005
    and the other one in 2011. Follow through with the deprecation and
    finally announce the removal of these features in Git 3.0.
    
    Signed-off-by: Patrick Steinhardt <[email protected]>
    [jc: with a small tweak to the help message]
    Signed-off-by: Junio C Hamano <[email protected]>
    pks-t authored and gitster committed Jan 24, 2025
    Configuration menu
    Copy the full SHA
    8ccc75c View commit details
    Browse the repository at this point in the history
Loading