debian: new "next" snapshot
Change-Id: I3d6561976ff5d047ecd630cb792e4950ff30c597
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
diff --git a/debian/changelog b/debian/changelog
index 4c7693a..ca53fd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git (1:2.43.0+next.20231221-1) experimental; urgency=low
+
+ * new snapshot, taken from upstream commit 3460e3d6.
+
+ -- Emily Shaffer <emilyshaffer@google.com> Tue, 26 Dec 2023 07:29:41 -0800
+
git (1:2.43.0+next.20231215-1) experimental; urgency=low
* new snapshot, taken from upstream commit ebba9660.
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index ddae652..f510643 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -32,12 +32,15 @@
completion: avoid misleading completions in cone mode
completion: avoid user confusion in non-cone mode
+Eric Sunshine (1):
+ git-add.txt: add missing short option -A to synopsis
+
Jeff Hostetler (3):
trace2: fix signature of trace2_def_param() macro
t0211: test URL redacting in PERF format
t0212: test URL redacting in EVENT format
-Jeff King (28):
+Jeff King (30):
commit-graph: handle overflow in chunk_size checks
midx: check consistency of fanout table
commit-graph: drop redundant call to "lite" verification
@@ -66,6 +69,12 @@
gpg-interface: drop pointless config_error_nonbool() checks
sequencer: simplify away extra git_config_string() call
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
+
+Jiang Xin (2):
+ t5574: test porcelain output of atomic fetch
+ fetch: no redundant error message for atomic fetch
Joanna Wang (1):
attr: enable attr pathspec magic for git-add and git-stash
@@ -98,18 +107,34 @@
Julian Prein (1):
hooks--pre-commit: detect non-ASCII when renaming
-Junio C Hamano (6):
+Junio C Hamano (17):
cache: add fake_lstat()
diff-lib: fix check_removed() when fsmonitor is active
checkout: refactor die_if_checked_out() caller
+ orphan/unborn: add to the glossary and use them consistently
+ orphan/unborn: fix use of 'orphan' in end-user facing messages
revision: parse integer arguments to --max-count, --skip, etc., more carefully
Start the 2.44 cycle
checkout: forbid "-B <branch>" from touching a branch used elsewhere
+ git.txt: HEAD is not that special
+ git-bisect.txt: BISECT_HEAD is not that special
+ refs.h: HEAD is not that special
+ docs: AUTO_MERGE is not that special
+ docs: MERGE_AUTOSTASH is not that special
+ doc: format.notes specify a ref under refs/notes/ hierarchy
+ The second batch
+ remote.h: retire CAS_OPT_NAME
+ The third 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
Marcel Krause (1):
doc: make the gitfile syntax easier to discover
-Patrick Steinhardt (50):
+Patrick Steinhardt (62):
t: allow skipping expected object ID in `ref-store update-ref`
t: convert tests to not write references via the filesystem
t: convert tests to not access symrefs via the filesystem
@@ -160,11 +185,23 @@
reftable/merged: reuse buffer to compute record keys
reftable/block: introduce macro to initialize `struct block_iter`
reftable/block: reuse buffer to compute record keys
+ setup: extract function to create the refdb
+ setup: allow skipping creation of the refdb
+ remote-curl: rediscover repository when fetching refs
+ builtin/clone: fix bundle URIs with mismatching object formats
+ builtin/clone: set up sparse checkout later
+ builtin/clone: skip reading HEAD when retrieving remote
+ builtin/clone: create the refdb with the correct object format
+ wt-status: read HEAD and ORIG_HEAD via the refdb
+ refs: propagate errno when reading special refs fails
+ refs: complete list of special refs
+ bisect: consistently write BISECT_EXPECTED_REV via the refdb
+ tests: adjust whitespace in chainlint expectations
Phillip Wood (1):
unit tests: add TAP unit test framework
-René Scharfe (9):
+René Scharfe (13):
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
@@ -174,10 +211,24 @@
clean: factorize incompatibility message
worktree: standardize incompatibility messages
worktree: simplify incompatibility message for --orphan and commit-ish
+ show-ref: use die_for_incompatible_opt3()
+ t6300: avoid hard-coding object sizes
+ git-compat-util: convert skip_{prefix,suffix}{,_mem} to bool
+ rebase: use strvec_pushf() for format-patch revisions
+
+Rubén Justo (1):
+ status: fix branch shown when not only bisecting
+
+Shreyansh Paliwal (1):
+ test-lib-functions.sh: fix test_grep fail message wording
Simon Ser (1):
format-patch: fix ignored encode_email_headers for cover letter
+Stan Hu (2):
+ completion: refactor existence checks for pseudorefs
+ completion: support pseudoref existence checks for reftables
+
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 8b4d31f..5347d2f 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/ebba9660.tar.gz
+Source: https://git.kernel.org/pub/scm/git/git.git/snapshot/3460e3d6.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 f945ede..fd55513 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: Calvin Wan <calvinwan@google.com>
-Date: Sat, 16 Dec 2023 00:00:38 +0000
+From: Emily Shaffer <emilyshaffer@google.com>
+Date: Tue, 26 Dec 2023 07:29:00 -0800
Subject: record version
Generated using GIT-VERSION-GEN and git-gui/GIT-VERSION-GEN
-Signed-off-by: Calvin Wan <calvinwan@google.com>
+Signed-off-by: Emily Shaffer <emilyshaffer@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..54cd87c713
+index 0000000000..9961b6de17
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
-+2.43.0.195.gebba966016
++2.43.0.275.g3460e3d667
