[ubuntu/jammy-proposed] git 1:2.34.1-1ubuntu1.10 (Accepted)

[Matthew Ruffell]

git (1:2.34.1-1ubuntu1.10) jammy; urgency=medium

  * Fix issue where untracked files are not recovered during a stash
    pop/apply operation when a merge conflict is present. Untracked
    files are now correctly restored regardless if a conflict is
    present or not. (LP: #2026319)
    - d/p/lp-2026319-stash-do-not-return-before-restoring-untracked-files.patch

Date: Fri, 07 Jul 2023 14:31:14 +1200
Changed-By: Matthew Ruffell <matthew.ruffell at canonical.com>
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Signed-By: Heitor Alves de Siqueira <halves at canonical.com>
https://launchpad.net/ubuntu/+source/git/1:2.34.1-1ubuntu1.10
-------------- next part --------------
Format: 1.8
Date: Fri, 07 Jul 2023 14:31:14 +1200
Source: git
Built-For-Profiles: noudeb
Architecture: source
Version: 1:2.34.1-1ubuntu1.10
Distribution: jammy
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Matthew Ruffell <matthew.ruffell at canonical.com>
Launchpad-Bugs-Fixed: 2026319
Changes:
 git (1:2.34.1-1ubuntu1.10) jammy; urgency=medium
 .
   * Fix issue where untracked files are not recovered during a stash
     pop/apply operation when a merge conflict is present. Untracked
     files are now correctly restored regardless if a conflict is
     present or not. (LP: #2026319)
     - d/p/lp-2026319-stash-do-not-return-before-restoring-untracked-files.patch
Checksums-Sha1:
 01f201340d45adfa16a36fd55ca1e0db8d6b7747 2931 git_2.34.1-1ubuntu1.10.dsc
 757f96faf27f178bc7f25a2a0217de73ed5f1ba0 758892 git_2.34.1-1ubuntu1.10.debian.tar.xz
 e031bf49d4679167c57a8ed4453fe4d37a84dce7 10294 git_2.34.1-1ubuntu1.10_source.buildinfo
Checksums-Sha256:
 204a04a070cfeec5238e1ca233834025ec1120ce69897717e1464ffaba4cac4c 2931 git_2.34.1-1ubuntu1.10.dsc
 a30243b26fbc66e3f6e12853b872159e58fc42a26f4f9b99fc30e5abb5970de0 758892 git_2.34.1-1ubuntu1.10.debian.tar.xz
 8dd05f672651f8047effe7f2e6b904f0a3a80714e3683306d31b96742feea798 10294 git_2.34.1-1ubuntu1.10_source.buildinfo
Files:
 6261f888dad16148fa8f8653f205b088 2931 vcs optional git_2.34.1-1ubuntu1.10.dsc
 f034fb6e13ae39c5dba0c43c7799b470 758892 vcs optional git_2.34.1-1ubuntu1.10.debian.tar.xz
 9914dfd452f6b7d04842951c9e5c8f8a 10294 vcs optional git_2.34.1-1ubuntu1.10_source.buildinfo
Original-Maintainer: Jonathan Nieder <jrnieder at gmail.com>