debian: new "next" snapshot
Change-Id: I5d9aa337a546c663cd8a1996b30c1af4b32a98aa
Signed-off-by: Josh Steadmon <steadmon@google.com>
diff --git a/debian/changelog b/debian/changelog
index ca53fd3..9a04f1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git (1:2.43.0+next.20240104-1) experimental; urgency=low
+
+ * new snapshot, taken from upstream commit b435a96c.
+
+ -- Josh Steadmon <steadmon@google.com> Fri, 05 Jan 2024 10:07:45 -0800
+
git (1:2.43.0+next.20231221-1) experimental; urgency=low
* new snapshot, taken from upstream commit 3460e3d6.
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index f510643..d56a767 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -12,7 +12,10 @@
Arthur Chan (1):
fuzz: add new oss-fuzz fuzzer for date.c / date.h
-Elijah Newren (18):
+Chandra Pratap (1):
+ write-or-die: make GIT_FLUSH a Boolean environment variable
+
+Elijah Newren (31):
t6429: remove switching aspects of fast-rebase
replay: introduce new builtin
replay: start using parse_options API
@@ -31,6 +34,19 @@
completion: fix logic for determining whether cone mode is active
completion: avoid misleading completions in cone mode
completion: avoid user confusion in non-cone mode
+ treewide: remove unnecessary includes from header files
+ treewide: remove unnecessary includes in source files
+ archive.h: remove unnecessary include
+ blame.h: remove unnecessary includes
+ fsmonitor--daemon.h: remove unnecessary includes
+ http.h: remove unnecessary include
+ line-log.h: remove unnecessary include
+ pkt-line.h: remove unnecessary include
+ submodule-config.h: remove unnecessary include
+ trace2/tr2_tls.h: remove unnecessary include
+ treewide: add direct includes currently only pulled in transitively
+ treewide: remove unnecessary includes in source files
+ sparse-checkout: be consistent with end of options markers
Eric Sunshine (1):
git-add.txt: add missing short option -A to synopsis
@@ -40,7 +56,7 @@
t0211: test URL redacting in PERF format
t0212: test URL redacting in EVENT format
-Jeff King (30):
+Jeff King (31):
commit-graph: handle overflow in chunk_size checks
midx: check consistency of fanout table
commit-graph: drop redundant call to "lite" verification
@@ -71,13 +87,18 @@
mailinfo: fix out-of-bounds memory reads in unquote_quoted_pair()
t5100: make rfc822 comment test more careful
mailinfo: avoid recursion when unquoting From headers
+ t1006: add tests for %(objectsize:disk)
-Jiang Xin (2):
+Jiang Xin (5):
t5574: test porcelain output of atomic fetch
fetch: no redundant error message for atomic fetch
+ test-pkt-line: add option parser for unpack-sideband
+ pkt-line: memorize sideband fragment in reader
+ pkt-line: do not chomp newlines for sideband messages
-Joanna Wang (1):
+Joanna Wang (2):
attr: enable attr pathspec magic for git-add and git-stash
+ attr: add builtin objectmode values support
Johannes Schindelin (10):
cmake: also build unit tests
@@ -94,11 +115,20 @@
Josh Brobst (1):
builtin/reflog.c: fix dry-run option short name
-Josh Soref (4):
+Josh Soref (13):
doc: update links to current pages
doc: switch links to https
doc: update links for andre-simon.de
doc: refer to internet archive
+ CodingGuidelines: move period inside parentheses
+ CodingGuidelines: write punctuation marks
+ SubmittingPatches: drop ref to "What's in git.git"
+ SubmittingPatches: discourage new trailers
+ SubmittingPatches: update extra tags list
+ SubmittingPatches: provide tag naming advice
+ SubmittingPatches: clarify GitHub visual
+ SubmittingPatches: clarify GitHub artifact format
+ SubmittingPatches: hyphenate non-ASCII
Josh Steadmon (2):
unit tests: add a project plan document
@@ -107,7 +137,7 @@
Julian Prein (1):
hooks--pre-commit: detect non-ASCII when renaming
-Junio C Hamano (17):
+Junio C Hamano (21):
cache: add fake_lstat()
diff-lib: fix check_removed() when fsmonitor is active
checkout: refactor die_if_checked_out() caller
@@ -125,15 +155,26 @@
The second batch
remote.h: retire CAS_OPT_NAME
The third batch
+ archive: "--list" does not take further options
+ sparse-checkout: use default patterns for 'set' only !stdin
+ The fourth batch
+ The fifth batch
Linus Arver (3):
commit: ignore_non_trailer computes number of bytes to ignore
trailer: find the end of the log message
trailer: use offsets for trailer_start/trailer_end
+Maarten van der Schrieck (1):
+ Documentation: fix statement about rebase.instructionFormat
+
Marcel Krause (1):
doc: make the gitfile syntax easier to discover
+Michael Lohmann (2):
+ Documentation/git-merge.txt: fix reference to synopsis
+ Documentation/git-merge.txt: use backticks for command wrapping
+
Patrick Steinhardt (62):
t: allow skipping expected object ID in `ref-store update-ref`
t: convert tests to not write references via the filesystem
@@ -201,7 +242,7 @@
Phillip Wood (1):
unit tests: add TAP unit test framework
-René Scharfe (13):
+René Scharfe (17):
column: release strbuf and string_list after use
i18n: factorize even more 'incompatible options' messages
push: use die_for_incompatible_opt4() for - -delete/--tags/--all/--mirror
@@ -215,6 +256,10 @@
t6300: avoid hard-coding object sizes
git-compat-util: convert skip_{prefix,suffix}{,_mem} to bool
rebase: use strvec_pushf() for format-patch revisions
+ fast-import: use mem_pool_calloc()
+ mem-pool: fix big allocations
+ mem-pool: simplify alignment calculation
+ t1006: prefer shell loop to awk for packed object sizes
Rubén Justo (1):
status: fix branch shown when not only bisecting
@@ -229,6 +274,34 @@
completion: refactor existence checks for pseudorefs
completion: support pseudoref existence checks for reftables
+Taylor Blau (26):
+ pack-objects: free packing_data in more places
+ pack-bitmap-write: deep-clear the `bb_commit` slab
+ pack-bitmap: plug leak in find_objects()
+ midx: factor out `fill_pack_info()`
+ midx: implement `BTMP` chunk
+ midx: implement `midx_locate_pack()`
+ pack-bitmap: pass `bitmapped_pack` struct to pack-reuse functions
+ ewah: implement `bitmap_is_empty()`
+ pack-bitmap: simplify `reuse_partial_packfile_from_bitmap()` signature
+ pack-bitmap: return multiple packs via `reuse_partial_packfile_from_bitmap()`
+ pack-objects: parameterize pack-reuse routines over a single pack
+ pack-objects: keep track of `pack_start` for each reuse pack
+ pack-objects: pass `bitmapped_pack`'s to pack-reuse functions
+ pack-objects: prepare `write_reused_pack()` for multi-pack reuse
+ pack-objects: prepare `write_reused_pack_verbatim()` for multi-pack reuse
+ pack-objects: include number of packs reused in output
+ git-compat-util.h: implement checked size_t to uint32_t conversion
+ midx: implement `midx_preferred_pack()`
+ pack-revindex: factor out `midx_key_to_pack_pos()` helper
+ pack-revindex: implement `midx_pair_to_pack_pos()`
+ pack-bitmap: prepare to mark objects from multiple packs for reuse
+ pack-objects: add tracing for various packfile metrics
+ t/test-lib-functions.sh: implement `test_trace2_data` helper
+ pack-objects: allow setting `pack.allowPackReuse` to "single"
+ pack-bitmap: enable reuse from all bitmapped packs
+ t/perf: add performance tests for multi-pack reuse
+
Todd Zullinger (2):
perl: bump the required Perl version to 5.8.1 from 5.8.0
send-email: avoid duplicate specification warnings
diff --git a/debian/copyright b/debian/copyright
index 5347d2f..8bbbb9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: git@vger.kernel.org
-Source: https://git.kernel.org/pub/scm/git/git.git/snapshot/3460e3d6.tar.gz
+Source: https://git.kernel.org/pub/scm/git/git.git/snapshot/b435a96c.tar.gz
Files: *
Copyright: © 2005-2023, Linus Torvalds and others.
diff --git a/debian/patches/0001-record-version.diff b/debian/patches/0001-record-version.diff
index fd55513..8423b58 100644
--- a/debian/patches/0001-record-version.diff
+++ b/debian/patches/0001-record-version.diff
@@ -1,11 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Emily Shaffer <emilyshaffer@google.com>
-Date: Tue, 26 Dec 2023 07:29:00 -0800
+From: Josh Steadmon <steadmon@google.com>
+Date: Fri, 5 Jan 2024 10:07:05 -0800
Subject: record version
Generated using GIT-VERSION-GEN and git-gui/GIT-VERSION-GEN
-Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
+Signed-off-by: Josh Steadmon <steadmon@google.com>
---
git-gui/version | 1 +
version | 1 +
@@ -22,8 +22,8 @@
+0.21.GITGUI
diff --git a/version b/version
new file mode 100644
-index 0000000000..9961b6de17
+index 0000000000..c5d1971b49
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
-+2.43.0.275.g3460e3d667
++2.43.0.381.gb435a96ce8
