From 6002896a816412411a162948ca130e3170248ac6 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 29 Jul 2019 17:09:40 -0700 Subject: [PATCH] debian: new upstream release candidate Signed-off-by: Jonathan Nieder --- debian/changelog | 6 + debian/changelog.upstream | 548 ++++++++++++++++++++++++++++++++++++++++++++++ debian/versions.upstream | 1 + 3 files changed, 555 insertions(+) diff --git a/debian/changelog b/debian/changelog index d205a0b890..ffeed5fdbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git (1:2.23.0~rc0-1) unstable; urgency=low + + * new upstream release candidate (see RelNotes/2.23.0.txt). + + -- Jonathan Nieder Mon, 29 Jul 2019 17:07:53 -0700 + git (1:2.22.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.21.0.txt, RelNotes/2.22.0.txt). diff --git a/debian/changelog.upstream b/debian/changelog.upstream index 701d377595..c8c7bdc91f 100644 --- a/debian/changelog.upstream +++ b/debian/changelog.upstream @@ -1,3 +1,551 @@ +Version v2.23.0-rc0; changes since v2.22.0: +------------------------------------------- + +Ariadne Conill (3): + log: add warning for unspecified log.mailmap setting + documentation: mention --no-use-mailmap and log.mailmap false setting + tests: defang pager tests by explicitly disabling the log.mailmap warning + +Barret Rhoden (8): + fsck: rename and touch up init_skiplist() + Move oidset_parse_file() to oidset.c + blame: use a helper function in blame_chunk() + blame: add the ability to ignore commits and their changes + blame: add config options for the output of ignored or unblamable lines + blame: optionally track line fingerprints during fill_blame_origin() + blame: use the fingerprint heuristic to match ignored lines + blame: add a test to cover blame_coalesce() + +Beat Bolli (2): + unicode: update the width tables to Unicode 12.1 + grep: print the pcre2_jit_on value + +Ben Avison (1): + clone: add `--remote-submodules` flag + +Boxuan Li (2): + userdiff: add Octave + userdiff: fix grammar and style issues + +Carlo Marcelo Arenas Belón (3): + fsmonitor: avoid signed integer overflow / infinite loop + wrapper: avoid undefined behaviour in macOS + trace2: correct typo in technical documentation + +Cesar Eduardo Barros (1): + mingw: embed a manifest to trick UAC into Doing The Right Thing + +Chris Mayo (1): + send-email: update documentation of required Perl modules + +Christian Couder (7): + t/helper: add test-oidmap.c + t: add t0016-oidmap.sh + oidmap: use sha1hash() instead of static hash() function + test-hashmap: remove 'hash' command + doc: improve usage string in MyFirstContribution + test-oidmap: remove 'add' subcommand + t0016: add 'remove' subcommand test + +Daniel Ferreira (1): + dir-iterator: add tests for dir-iterator API + +Denton Liu (5): + git-format-patch.txt: document --no-notes option + format-patch: teach format.notes config option + config: learn the "onbranch:" includeIf condition + config/alias.txt: change " and ' to ` + config/alias.txt: document alias accepting non-command first word + +Derrick Stolee (50): + commit-graph: fix the_repository reference + revision: use generation for A..B --topo-order queries + revision: keep topo-walk free of unintersting commits + sha1-file: split OBJECT_INFO_FOR_PREFETCH + repack: refactor pack deletion for future use + Docs: rearrange subcommands for multi-pack-index + multi-pack-index: prepare for 'expire' subcommand + midx: simplify computation of pack name lengths + midx: refactor permutation logic and pack sorting + multi-pack-index: implement 'expire' subcommand + multi-pack-index: prepare 'repack' subcommand + midx: implement midx_repack() + multi-pack-index: test expire while adding packs + midx: add test that 'expire' respects .keep files + t5319-multi-pack-index.sh: test batch size zero + commit-graph: return with errors during write + commit-graph: collapse parameters into flags + commit-graph: remove Future Work section + commit-graph: create write_commit_graph_context + commit-graph: extract fill_oids_from_packs() + commit-graph: extract fill_oids_from_commit_hex() + commit-graph: extract fill_oids_from_all_packs() + commit-graph: extract count_distinct_commits() + commit-graph: extract copy_oids_to_commits() + commit-graph: extract write_commit_graph_file() + commit-graph: use raw_object_store when closing + packfile: close commit-graph in close_all_packs + packfile: rename close_all_packs to close_object_store + commit-graph: document commit-graph chains + commit-graph: prepare for commit-graph chains + commit-graph: rename commit_compare to oid_compare + commit-graph: load commit-graph chains + commit-graph: add base graphs chunk + commit-graph: rearrange chunk count logic + commit-graph: write commit-graph chains + commit-graph: add --split option to builtin + commit-graph: merge commit-graph chains + commit-graph: allow cross-alternate chains + commit-graph: expire commit-graph files + commit-graph: create options for split files + commit-graph: verify chains with --shallow mode + commit-graph: clean up chains after flattened write + commit-graph: test octopus merges with --split + commit-graph: test --split across alternate without --split + commit-graph: normalize commit-graph filenames + commit-graph: test verify across alternates + fetch: add --[no-]show-forced-updates argument + fetch: warn about forced updates in branch listing + pull: add --[no-]show-forced-updates passthrough + t5319: use 'test-tool path-utils' instead of 'ls -l' + +Dimitriy Ryazantcev (1): + l10n: localizable upload progress messages + +Doug Ilijev (1): + README: fix rendering of text in angle brackets + +Dr. Adam Nielsen (1): + gitignore.txt: make slash-rules more readable + +Edmundo Carmona Antoranz (1): + builtin/merge.c - cleanup of code in for-cycle that tests strategies + +Elijah Newren (5): + t9350: fix encoding test to actually test reencoding + fast-import: support 'encoding' commit header + fast-export: avoid stripping encoding header if we cannot reencode + fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8 + fast-export: do automatic reencoding of commit messages only if requested + +Emily Shaffer (7): + documentation: add tutorial for first contribution + documentation: add anchors to MyFirstContribution + grep: fail if call could output and name is null + doc: hint about GIT_DEBUGGER in CodingGuidelines + doc: add some nit fixes to MyFirstContribution + rev-list: teach --no-object-names to enable piping + transport-helper: enforce atomic in push_refs_with_push + +Eric Wong (3): + update-server-info: avoid needless overwrites + server-info: do not list unlinked packs + repack: disable bitmaps-by-default if .keep files exist + +Felipe Contreras (5): + t5801 (remote-helpers): cleanup refspec stuff + t5801 (remote-helpers): add test to fetch tags + fetch: trivial cleanup + fetch: make the code more understandable + fetch: fix regression with transport helpers + +Jakub Wilk (1): + doc: don't use git.kernel.org as example gitweb URL + +Jeff Hostetler (13): + cache-tree/blame: avoid reusing the DEBUG constant + msvc: mark a variable as non-const + msvc: do not re-declare the timespec struct + msvc: define ftello() + msvc: fix detect_msys_tty() + msvc: update Makefile to allow for spaces in the compiler path + status: add status.aheadbehind setting + status: warn when a/b calculation takes too long + status: ignore status.aheadbehind in porcelain formats + msvc: support building Git using MS Visual C++ + msvc: add a compile-time flag to allow detailed heap debugging + msvc: do not pretend to support all signals + msvc: ignore .dll and incremental compile output + +Jeff King (50): + cmd_{read,write}_tree: rename "unused" variable that is used + builtin: consistently pass cmd_* prefix to parse_options + submodule: drop unused prefix parameter from some functions + clone: drop dest parameter from copy_alternates() + read-cache: drop unused parameter from threaded load + wt-status: drop unused status parameter + mktree: drop unused length parameter + name-rev: drop unused parameters from is_better_name() + pack-objects: drop unused rev_info parameters + receive-pack: drop unused "commands" from prepare_shallow_update() + remove_all_fetch_refspecs(): drop unused "remote" parameter + rev-list: drop unused void pointer from finish_commit() + show-branch: drop unused parameter from show_independent() + verify-commit: simplify parameters to run_gpg_verify() + help_unknown_ref(): duplicate collected refnames + help_unknown_ref(): check for refname ambiguity + upload-pack: strip namespace from symref data + am: simplify prompt response handling + am: read interactive input from stdin + am: drop tty requirement for --interactive + am: fix --interactive HEAD tree resolution + interpret-trailers: load default config + describe: fix accidental oid/hash type-punning + upload-pack: rename a "sha1" variable to "oid" + pack-bitmap-write: convert some helpers to use object_id + pack-objects: convert packlist_find() to use object_id + pack-objects: convert locate_object_entry_hash() to object_id + object: convert lookup_unknown_object() to use object_id + object: convert lookup_object() to use object_id + object: convert internal hash_obj() to object_id + object: convert create_object() to use object_id + khash: drop broken oid_map typedef + khash: rename kh_oid_t to kh_oid_set + delta-islands: convert island_marks khash to use oids + pack-bitmap: convert khash_sha1 maps into kh_oid_map + khash: drop sha1-specific map types + khash: rename oid helper functions + hash.h: move object_id definition from cache.h + hashmap: convert sha1hash() to oidhash() + delta-islands: respect progress flag + blame: drop some unused function parameters + object-store.h: move for_each_alternate_ref() from transport.h + check_everything_connected: assume alternate ref tips are valid + test-lib: introduce test_commit_bulk + t5310: increase the number of bitmapped commits + t3311: use test_commit_bulk + t5702: use test_commit_bulk + t5703: use test_commit_bulk + t6200: use test_commit_bulk + xdiff: clamp function context indices in post-image + +Johannes Schindelin (32): + Drop unused git-rebase--am.sh + t3400: stop referring to the scripted rebase + .gitignore: there is no longer a built-in `git-rebase--interactive` + sequencer: the `am` and `rebase--interactive` scripts are gone + rebase: fold git-rebase--common into the -p backend + bisect--helper: verify HEAD could be parsed before continuing + fill_stat_cache_info(): prepare for an fsmonitor fix + mark_fsmonitor_valid(): mark the index as changed if needed + bundle verify: error out if called without an object database + poll (mingw): allow compiling with GCC 8 and DEVELOPER=1 + kwset: allow building with GCC 8 + winansi: simplify loading the GetCurrentConsoleFontEx() function + config: avoid calling `labs()` on too-large data type + t3404: fix a typo + mingw: fix a typo in the msysGit-specific section + Mark .bat files as requiring CR/LF endings + t0001 (mingw): do not expect a specific order of stdout/stderr + obstack: fix compiler warning + mingw: replace mingw_startup() hack + msvc: fix dependencies of compat/msvc.c + t0001: fix on case-insensitive filesystems + msvc: avoid debug assertion windows in Debug Mode + mingw: enable stack smashing protector + mingw: get pw_name in UTF-8 format + mingw: use Unicode functions explicitly + rebase --am: ignore rebase.rescheduleFailedExec + mingw: fix possible buffer overrun when calling `GetUserNameW()` + diff: munmap() file contents before running external diff + mingw: support spawning programs containing spaces in their names + clean: show an error message when the path is too long + rebase: fix white-space + git: mark cmd_rebase as requiring a worktree + +Johannes Sixt (5): + userdiff: two simplifications of patterns for rust + t7610-mergetool: do not place pipelines headed by `yes` in subshells + t7610-mergetool: use test_cmp instead of test $(cat file) = $txt + mergetool: dissect strings with shell variable magic instead of `expr` + mergetool: use shell variable magic instead of `awk` + +John Lin (1): + status: remove the empty line after hints + +Jonathan Tan (5): + t5616: refactor packfile replacement + index-pack: prefetch missing REF_DELTA bases + t5616: use correct flag to check object is missing + t5616: cover case of client having delta base + t5551: test usage of chunked encoding explicitly + +Josh Steadmon (1): + trace2: correct trace2 field name documentation + +Junio C Hamano (13): + The first batch after 2.22 + The second batch + The third batch + The fourth batch + The fifth batch + transport-helper: avoid var decl in for () loop control + rm: resolving by removal is not a warning-worthy event + CodingGuidelines: spell out post-C89 rules + The sixth batch + The seventh batch + Flush fixes up to the third batch post 2.22.0 + Merge fixes made on the 'master' front + Git 2.23-rc0 + +Karsten Blees (2): + gettext: always use UTF-8 on native Windows + mingw: initialize HOME on startup + +Marc-André Lureau (1): + userdiff: add built-in pattern for rust + +Martin Ågren (1): + ref-filter: fix memory leak in `free_array_item()` + +Matheus Tavares (8): + clone: better handle symlinked files at .git/objects/ + dir-iterator: use warning_errno when possible + dir-iterator: refactor state machine model + dir-iterator: add flags parameter to dir_iterator_begin + clone: copy hidden paths at local clone + clone: extract function from copy_or_link_directory + clone: use dir-iterator to avoid explicit dir traversal + clone: replace strcmp by fspathcmp + +Matthew DeVore (5): + list-objects-filter-options: error is localizeable + list-objects-filter: correct usage of ALLOC_GROW + url: do not read past end of buffer + url: do not allow %00 to represent NUL in URLs + ref-filter: sort detached HEAD lines firstly + +Mazo, Andrey (8): + git-p4: detect/prevent infinite loop in gitCommitByP4Change() + git-p4: add failing test for "git-p4: match branches case insensitively if configured" + git-p4: match branches case insensitively if configured + git-p4: don't groom exclude path list on every commit + git-p4: add failing test for "don't exclude other files with same prefix" + git-p4: don't exclude other files with same prefix + git-p4: add failing test for "git-p4: respect excluded paths when detecting branches" + git-p4: respect excluded paths when detecting branches + +Michael Osipov (1): + configure: Detect linking style for HP aCC on HP-UX + +Michael Platings (2): + blame: add a fingerprint heuristic to match ignored lines + t8014: remove unnecessary braces + +Miguel Ojeda (1): + clang-format: use git grep to generate the ForEachMacros list + +Mike Hommey (2): + dup() the input fd for fast-import used for remote helpers + Use xmmap_gently instead of xmmap in use_pack + +Mike Mueller (1): + p4 unshelve: fix "Not a valid object name HEAD0" on Windows + +Morian Sonnet (1): + submodule foreach: fix recursion of options + +Nguyễn Thái Ngọc Duy (63): + git-checkout.txt: spell out --no-option + git-checkout.txt: fix one syntax line + doc: document --overwrite-ignore + git-checkout.txt: fix monospace typeset + t: rename t2014-switch.sh to t2014-checkout-switch.sh + checkout: advice how to get out of detached HEAD mode + checkout: inform the user when removing branch state + checkout: keep most #include sorted + checkout: factor out some code in parse_branchname_arg() + checkout: make "opts" in cmd_checkout() a pointer + checkout: move 'confict_style' and 'dwim_..' to checkout_opts + checkout: split options[] array in three pieces + checkout: split part of it to new command 'switch' + switch: better names for -b and -B + switch: add --discard-changes + switch: remove -l + switch: stop accepting pathspec + switch: reject "do nothing" case + switch: only allow explicit detached HEAD + switch: add short option for --detach + switch: implicit dwim, use --no-guess to disable it + switch: no worktree status unless real branch switch happens + switch: reject if some operation is in progress + switch: make --orphan switch to an empty tree + t: add tests for switch + completion: support switch + doc: promote "git switch" + checkout: split part of it to new command 'restore' + restore: take tree-ish from --source option instead + restore: make pathspec mandatory + restore: disable overlay mode by default + checkout: factor out worktree checkout code + restore: add --worktree and --staged + restore: reject invalid combinations with --staged + restore: default to --source=HEAD when only --staged is specified + restore: replace --force with --ignore-unmerged + restore: support --patch + t: add tests for restore + completion: support restore + user-manual.txt: prefer 'merge --abort' over 'reset --hard' + doc: promote "git restore" + help: move git-diff and git-reset to different groups + Declare both git-switch and git-restore experimental + merge: remove drop_save() in favor of remove_merge_branch_state() + init: make --template path relative to $CWD + worktree add: sanitize worktree names + worktree add: be tolerant of corrupt worktrees + merge: add --quit + completion: do not cache if --git-completion-helper fails + fetch: only run 'gc' once when fetching multiple remotes + t2027: use test_must_be_empty + switch: allow to switch in the middle of bisect + completion: disable dwim on "git switch -d" + fetch-pack: move capability names out of i18n strings + fetch-pack: print all relevant supported capabilities with -v -v + fetch-pack: print server version at the top in -v -v + sha1-file.c: remove the_repo from read_object_with_reference() + tree-walk.c: remove the_repo from fill_tree_descriptor() + tree-walk.c: remove the_repo from get_tree_entry() + tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks() + match-trees.c: remove the_repo from shift_tree*() + Use the right 'struct repository' instead of the_repository + t7814: do not generate same commits in different repos + +Nickolai Belakovski (3): + ref-filter: add worktreepath atom + branch: update output to include worktree info + branch: add worktree info on verbose output + +Paolo Bonzini (2): + request-pull: quote regex metacharacters in local ref + request-pull: warn if the remote object is not the same as the local one + +Philip Oakley (6): + git.c: show usage for accessing the git(1) help page + Doc: git.txt: remove backticks from link and add git-scm.com/docs + doc branch: provide examples for listing remote tracking branches + msvc: include sigset_t definition + msvc: define O_ACCMODE + msvc: add pragmas for common warnings + +Phillip Wood (12): + rebase: fix a memory leak + rebase: warn if state directory cannot be removed + sequencer: return errors from sequencer_remove_state() + rebase --abort/--quit: cleanup refs/rewritten + rebase -r: always reword merge -c + add -p: fix checkout -p with pathological context + show --continue/skip etc. consistently in synopsis + sequencer: always allow tab after command name + sequencer: factor out todo command name parsing + status: do not report errors in sequencer/todo + git-prompt: improve cherry-pick/revert detection + t3420: remove progress lines before comparing output + +Quentin Nerden (2): + docs: git-clone: refer to long form of options + docs: git-clone: list short form of options first + +Ramsay Jones (1): + env--helper: mark a file-local symbol as static + +René Scharfe (6): + cleanup: fix possible overflow errors in binary search, part 2 + coccinelle: use COPY_ARRAY for copying arrays + use COPY_ARRAY for copying arrays + config: use unsigned_mult_overflows to check for overflows + config: don't multiply in parse_unit_factor() + config: simplify parsing of unit factors + +Robert Morgan (1): + gpg(docs): use correct --verify syntax + +Rohit Ashiwal (5): + sequencer: add advice for revert + sequencer: rename reset_for_rollback to reset_merge + sequencer: use argv_array in reset_merge + cherry-pick/revert: add --skip option + cherry-pick/revert: advise using --skip + +SZEDER Gábor (11): + t3404: modernize here doc style + t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused + pager: add a helper function to clear the last line in the terminal + t5551: use 'test_i18ngrep' to check translated output + rebase: fix garbled progress display with '-x' + progress: use term_clear_line() + Document that 'git -C ""' works and doesn't change directory + ci: don't update Homebrew + ci: disable Homebrew's auto cleanup + ci/lib.sh: update a comment about installed P4 and Git-LFS versions + travis-ci: build with GCC 4.8 as well + +Simon Williams (1): + git-p4: allow unshelving of branched files + +Stephen Boyd (2): + format-patch: inform user that patch-id generation is unstable + format-patch: make --base patch-id output stable + +Steven Roberts (1): + gpg-interface: do not scan past the end of buffer + +Taylor Blau (1): + ref-filter.c: find disjoint pattern prefixes + +Thomas Gummerer (16): + stash: fix show referencing stash index + apply: replace marc.info link with public-inbox + apply: only pass required data to skip_tree_prefix + apply: only pass required data to git_header_name + apply: only pass required data to check_header_line + apply: only pass required data to find_name_* + apply: only pass required data to gitdiff_* functions + apply: make parse_git_diff_header public + range-diff: fix function parameter indentation + range-diff: split lines manually + range-diff: don't remove funcname from inner diff + range-diff: suppress line count in outer diff + range-diff: add section header instead of diff header + range-diff: add filename to inner diff + range-diff: add headers to the outer hunk header + stash: fix handling removed files with --keep-index + +Tigran Mkrtchyan (1): + tag: add tag.gpgSign config option to force all tags be GPG-signed + +Varun Naik (1): + read-cache.c: do not die if mmap fails + +Vishal Verma (1): + merge: refuse --commit with --squash + +Xin Li (1): + clone: respect user supplied origin name when setting up partial clone + +Ævar Arnfjörð Bjarmason (21): + send-email: move the read_config() function above getopts + send-email: rename the @bcclist variable for consistency + send-email: do defaults -> config -> getopt in that order + tests: add a special setup where prerequisites fail + Makefile: remove the NO_R_TO_GCC_LINKER flag + send-email: remove cargo-culted multi-patch pattern in tests + send-email: fix broken transferEncoding tests + send-email: document --no-[to|cc|bcc] + hash-object doc: stop mentioning git-cvsimport + send-email: fix regression in sendemail.identity parsing + Revert "test-lib: whitelist GIT_TR2_* in the environment" + config tests: simplify include cycle test + env--helper: new undocumented builtin wrapping git_env_*() + config.c: refactor die_bad_number() to not call gettext() early + t6040 test: stop using global "script" variable + tests: make GIT_TEST_GETTEXT_POISON a boolean + tests README: re-flow a previously changed paragraph + tests: replace test_tristate with "git env--helper" + tests: make GIT_TEST_FAIL_PREREQS a boolean + tests: mark two failing tests under FAIL_PREREQS + clone: test for our behavior on odd objects/* content + + Version v2.22.0; changes since v2.22.0-rc3: ------------------------------------------- diff --git a/debian/versions.upstream b/debian/versions.upstream index da8d83851e..8022cfd77c 100644 --- a/debian/versions.upstream +++ b/debian/versions.upstream @@ -644,3 +644,4 @@ v2.22.0-rc1 v2.22.0-rc2 v2.22.0-rc3 v2.22.0 +v2.23.0-rc0 -- 2.11.4.GIT