From 52f0c5f5fbc0e1355517b4482c1f4714e1857acc Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 28 Aug 2015 14:27:42 -0700 Subject: [PATCH] debian: new upstream point release Signed-off-by: Jonathan Nieder --- debian/changelog | 6 +++ debian/changelog.upstream | 117 +++++++++++++++++++++++++++++++++++++++------- debian/versions.upstream | 2 + 3 files changed, 109 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index a5a74621b3..2ce657261a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git (1:2.5.1-1) unstable; urgency=medium + + * new upstream point release (see RelNotes/2.5.1.txt). + + -- Jonathan Nieder Fri, 28 Aug 2015 14:27:25 -0700 + git (1:2.5.0-1) unstable; urgency=low * new upstream release (see RelNotes/2.5.0.txt). diff --git a/debian/changelog.upstream b/debian/changelog.upstream index 7bf1e79dd5..c73ec5bce6 100644 --- a/debian/changelog.upstream +++ b/debian/changelog.upstream @@ -1,3 +1,68 @@ +Version v2.5.1; changes since v2.5.0: +------------------------------------- + +Charles Bailey (1): + untracked: fix detection of uname(2) failure + +David Aguilar (1): + contrib/subtree: ignore log.date configuration + +David Turner (1): + unpack-trees: don't update files with CE_WT_REMOVE set + +Eric Sunshine (5): + Documentation/git: drop outdated Cogito reference + Documentation/git-tools: improve discoverability of Git wiki + Documentation/git-tools: fix item text formatting + Documentation/git-tools: drop references to defunct tools + Documentation/git-tools: retire manually-maintained list + +Ilya Bobyr (1): + rev-parse --parseopt: allow [*=?!] in argument hints + +Jeff King (4): + test-lib: turn off "-x" tracing during chain-lint check + test-lib: disable trace when test is not verbose + clone: add tests for output directory + clone: use computed length in guess_dir_name + +Jiang Xin (1): + receive-pack: crash when checking with non-exist HEAD + +Jose F. Morales (1): + Mingw: verify both ends of the pipe () call + +Junio C Hamano (5): + builtin/send-pack.c: respect user.signingkey + Git 2.4.8 + Start preparing for 2.5.1 + pull: pass upload_pack only when it was given + Git 2.5.1 + +Karthik Nayak (1): + Documentation/tag: remove double occurance of "" + +Matthieu Moy (1): + pull.sh: quote $upload_pack when passing it to git-fetch + +Mike Hommey (1): + fast-import: do less work when given "from" matches current branch head + +Nguyễn Thái Ngọc Duy (1): + setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR + +Simon A. Eugster (1): + checkout: document subtlety around --ours/--theirs + +Stefan Beller (3): + parse-options: align curly braces for all options + add: remove dead code + transport-helper: die on errors reading refs. + +Thomas Ackermann (1): + typofix for index-format.txt + + Version v2.5.0; changes since v2.5.0-rc3: ----------------------------------------- @@ -175,7 +240,7 @@ Mike Edgar (1): fetch-pack: check for shallow if depth given -Version v2.5.0-rc0; changes since v2.4.7: +Version v2.5.0-rc0; changes since v2.4.8: ----------------------------------------- Allen Hubbe (1): @@ -346,7 +411,7 @@ Max Kirillov (3): git-common-dir: make "modules/" per-working-directory directory prune --worktrees: fix expire vs worktree existence condition -Michael Haggerty (66): +Michael Haggerty (62): lockfile: allow file locking to be retried with a timeout lock_packed_refs(): allow retries when acquiring the packed-refs lock each_ref_fn: change to take an object_id parameter @@ -409,10 +474,6 @@ Michael Haggerty (66): verify_lock(): report errors via a strbuf verify_lock(): do not capitalize error messages ref_transaction_commit(): do not capitalize error messages - t6301: new tests of for-each-ref error handling - for-each-ref: report broken references correctly - read_loose_refs(): simplify function logic - read_loose_refs(): treat NULL_SHA1 loose references as broken Miguel Torroja (1): p4: retrieve the right revision of the file in UTF-16 codepath @@ -485,7 +546,7 @@ Nguyễn Thái Ngọc Duy (63): pathspec: avoid the need of "--" when wildcard is used read-cache: fix untracked cache invalidation when split-index is used -Paul Tan (16): +Paul Tan (10): t5520: prevent field splitting in content comparisons t5520: test no merge candidates cases t5520: test for failure if index has unresolved entries @@ -496,12 +557,6 @@ Paul Tan (16): t5520: check reflog action in fast-forward merge pull: handle git-fetch's options as well pull: use git-rev-parse --parseopt for option parsing - am --skip: revert changes introduced by failed 3way merge - am -3: support 3way merge on unborn branch - am --skip: support skipping while on unborn branch - am --abort: revert changes introduced by failed 3way merge - am --abort: support aborting to unborn branch - am --abort: keep unrelated commits on unborn branch Quentin Neill (1): blame: add blame.showEmail configuration @@ -514,13 +569,11 @@ Remi Lespinet (3): t4150-am: refactor am -3 tests git-am: add am.threeWay config variable -SZEDER Gábor (6): +SZEDER Gábor (4): completion: remove redundant __git_compute_all_commands() call completion: remove credential helpers from porcelain commands completion: add a helper function to get config variables completion: simplify query for config variables - completion: teach 'scissors' mode to 'git commit --cleanup=' - commit: cope with scissors lines in commit message Stefan Beller (2): prefix_path(): unconditionally free results in the callers @@ -565,6 +618,38 @@ brian m. carlson (11): refs: convert struct ref_entry to use struct object_id +Version v2.4.8; changes since v2.4.7: +------------------------------------- + +Johannes Schindelin (2): + t3404: demonstrate CHERRY_PICK_HEAD bug + rebase -i: do not leave a CHERRY_PICK_HEAD file behind + +Junio C Hamano (1): + Git 2.4.8 + +Michael Haggerty (4): + t6301: new tests of for-each-ref error handling + for-each-ref: report broken references correctly + read_loose_refs(): simplify function logic + read_loose_refs(): treat NULL_SHA1 loose references as broken + +Paul Tan (6): + am --skip: revert changes introduced by failed 3way merge + am -3: support 3way merge on unborn branch + am --skip: support skipping while on unborn branch + am --abort: revert changes introduced by failed 3way merge + am --abort: support aborting to unborn branch + am --abort: keep unrelated commits on unborn branch + +SZEDER Gábor (2): + completion: teach 'scissors' mode to 'git commit --cleanup=' + commit: cope with scissors lines in commit message + +Sebastian Schuberth (1): + clone: simplify string handling in guess_dir_name() + + Version v2.4.7; changes since v2.4.6: ------------------------------------- diff --git a/debian/versions.upstream b/debian/versions.upstream index c745fbe57e..23dc9f678c 100644 --- a/debian/versions.upstream +++ b/debian/versions.upstream @@ -487,8 +487,10 @@ v2.4.4 v2.4.5 v2.4.6 v2.4.7 +v2.4.8 v2.5.0-rc0 v2.5.0-rc1 v2.5.0-rc2 v2.5.0-rc3 v2.5.0 +v2.5.1 -- 2.11.4.GIT