vcswatch reports that
this package seems to have new commits in its VCS but has
not yet updated debian/changelog. You should consider updating
the Debian changelog and uploading this new version into the archive.
Here are the relevant commit logs:
commit 6d5a1554b1ebf42dbba0897f21c53b660d98f8ce
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Sep 20 13:48:49 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 3676a9da08131e127df4a0f9c192b5ca67139d09
Merge: 66cb68a76a 18eeb5a265
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Sep 20 13:39:57 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 18eeb5a2650ef4d662f5c9bb888cac8694753ba5
Merge: 10702dd989 4c86140027
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:23:16 2019 -0700
Sync with master
* master:
Third batch
git-gui: add hotkey to toggle "Amend Last Commit"
git-gui: add horizontal scrollbar to commit buffer
git-gui: convert new/amend commit radiobutton to checkbutton
git-gui: add hotkeys to set widget focus
git-gui: allow undoing last revert
git-gui: return early when patch fails to apply
git-gui: allow reverting selected hunk
git-gui: allow reverting selected lines
commit 10702dd9890c148ecf5154e216598b3a4273e57e
Merge: 6d8ed846ed 50f26bd035
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:21:51 2019 -0700
Merge branch 'ds/commit-graph-on-fetch' into next
A configuration variable tells "git fetch" to write the commit
graph after finishing.
* ds/commit-graph-on-fetch:
fetch: add fetch.writeCommitGraph config setting
commit 6d8ed846edc0a0785efa54be522dd2035a0c0f8f
Merge: 1a3655a089 bf1e28e0ad
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:21:51 2019 -0700
Merge branch 'bw/rebase-autostash-keep-current-branch' into next
"git rebase --autostash <upstream> <branch>", when <branch> is
different from the current branch, incorrectly moved the tip of the
current branch, which has been corrected.
* bw/rebase-autostash-keep-current-branch:
builtin/rebase.c: Remove pointless message
builtin/rebase.c: make sure the active branch isn't moved when autostashing
commit 1a3655a089ed892e59edd6d3d650765e16cf59fe
Merge: f52cb08a14 468ce99b77
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:21:51 2019 -0700
Merge branch 'ds/include-exclude' into next
The internal code originally invented for ".gitignore" processing
got reshuffled and renamed to make it less tied to "excluding" and
stress more that it is about "matching", as it has been reused for
things like sparse checkout specification that want to check if a
path is "included".
* ds/include-exclude:
unpack-trees: rename 'is_excluded_from_list()'
treewide: rename 'exclude' methods to 'pattern'
treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_'
treewide: rename 'struct exclude_list' to 'struct pattern_list'
treewide: rename 'struct exclude' to 'struct path_pattern'
commit f52cb08a14fda5505611c269d6084a32bcca7db9
Merge: 503974aa46 4615a8cb5b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:21:50 2019 -0700
Merge branch 'en/merge-recursive-cleanup' into next
The merge-recursive machiery is one of the most complex parts of
the system that accumulated cruft over time. This large series
cleans up the implementation quite a bit.
* en/merge-recursive-cleanup: (24 commits)
merge-recursive: alphabetize include list
merge-recursive: add sanity checks for relevant merge_options
merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*
merge-recursive: split internal fields into a separate struct
merge-recursive: avoid losing output and leaking memory holding that output
merge-recursive: comment and reorder the merge_options fields
merge-recursive: consolidate unnecessary fields in merge_options
merge-recursive: move some definitions around to clean up the header
merge-recursive: rename merge_options argument to opt in header
merge-recursive: rename 'mrtree' to 'result_tree', for clarity
merge-recursive: use common name for ancestors/common/base_list
merge-recursive: fix some overly long lines
cache-tree: share code between functions writing an index as a tree
merge-recursive: don't force external callers to do our logging
merge-recursive: remove useless parameter in merge_trees()
merge-recursive: exit early if index != head
Ensure index matches head before invoking merge machinery, round N
merge-recursive: remove another implicit dependency on the_repository
merge-recursive: future-proof update_file_flags() against memory leaks
merge-recursive: introduce an enum for detect_directory_renames values
...
commit 503974aa4671cc4a1145bc37cde09ff576207660
Merge: f94f486724 742ed63345
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:21:50 2019 -0700
Merge branch 'jh/trace2-pretty-output' into next
Output from trace2 subsystem is formatted more prettily now.
* jh/trace2-pretty-output:
trace2: cleanup whitespace in perf format
trace2: cleanup whitespace in normal format
quote: add sq_append_quote_argv_pretty()
trace2: trim trailing whitespace in normal format error message
trace2: remove dead code in maybe_add_string_va()
trace2: trim whitespace in region messages in perf target format
trace2: cleanup column alignment in perf target format
commit f94f4867243e2302c6a178be9afa533a5fca1841
Merge: 0da1269f07 414d924beb
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:21:50 2019 -0700
Merge branch 'dl/rebase-i-keep-base' into next
"git rebase --keep-base <upstream>" tries to find the original base
of the topic being rebased and rebase on top of that same base,
which is useful when running the "git rebase -i" (and its limited
variant "git rebase -x").
The command also has learned to fast-forward in more cases where it
can instead of replaying to recreate identical commits.
* dl/rebase-i-keep-base:
rebase: teach rebase --keep-base
rebase tests: test linear branch topology
rebase: fast-forward --fork-point in more cases
rebase: fast-forward --onto in more cases
rebase: refactor can_fast_forward into goto tower
t3432: test for --no-ff's interaction with fast-forward
t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
t3432: test rebase fast-forward behavior
t3431: add rebase --fork-point tests
commit 0da1269f073a4d374c7f431ffaf56c45dd46691d
Merge: 7dd173f824 502c386ff9
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:21:49 2019 -0700
Merge branch 'sg/clean-nested-repo-with-ignored' into next
A bug documentation.
* sg/clean-nested-repo-with-ignored:
t7300-clean: demonstrate deleting nested repo with an ignored file breakage
commit 7dd173f8249bb739f80bb245570f249867a3f0a5
Merge: b967887aa5 86ae43da6a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 15:21:49 2019 -0700
Merge branch 'dl/complete-cherry-pick-revert-skip' into next
The command line completion support (in contrib/) learned about the
"--skip" option of "git revert" and "git cherry-pick".
* dl/complete-cherry-pick-revert-skip:
status: mention --skip for revert and cherry-pick
completion: add --skip for cherry-pick and revert
completion: merge options for cherry-pick and revert
commit 4c86140027f4a0d2caaa3ab4bd8bfc5ce3c11c8a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:55:13 2019 -0700
Third batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f67bf53300ac7bd57a593a3ec2338050ea8343f1
Merge: 627b826834 fddf2ebe38
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:10 2019 -0700
Merge branch 'jt/avoid-ls-refs-with-http'
The http transport lacked some optimization the native transports
learned to avoid unnecessary ref advertisement, which has been
corrected.
* jt/avoid-ls-refs-with-http:
transport: teach all vtables to allow fetch first
transport-helper: skip ls-refs if unnecessary
commit 627b82683447e299fc2e20140318c276efbf7de2
Merge: b9ac6c59b8 90d21f9ebf
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:09 2019 -0700
Merge branch 'md/list-objects-filter-combo'
The list-objects-filter API (used to create a sparse/lazy clone)
learned to take a combined filter specification.
* md/list-objects-filter-combo:
list-objects-filter-options: make parser void
list-objects-filter-options: clean up use of ALLOC_GROW
list-objects-filter-options: allow mult. --filter
strbuf: give URL-encoding API a char predicate fn
list-objects-filter-options: make filter_spec a string_list
list-objects-filter-options: move error check up
list-objects-filter: implement composite filters
list-objects-filter-options: always supply *errbuf
list-objects-filter: put omits set in filter struct
list-objects-filter: encapsulate filter components
commit b9ac6c59b82dead613b31a51c8bca4dbd441bcbe
Merge: de67293e74 4ca9474efa
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:09 2019 -0700
Merge branch 'cc/multi-promisor'
Teach the lazy clone machinery that there can be more than one
promisor remote and consult them in order when downloading missing
objects on demand.
* cc/multi-promisor:
Move core_partial_clone_filter_default to promisor-remote.c
Move repository_format_partial_clone to promisor-remote.c
Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
remote: add promisor and partial clone config to the doc
partial-clone: add multiple remotes in the doc
t0410: test fetching from many promisor remotes
builtin/fetch: remove unique promisor remote limitation
promisor-remote: parse remote.*.partialclonefilter
Use promisor_remote_get_direct() and has_promisor_remote()
promisor-remote: use repository_format_partial_clone
promisor-remote: add promisor_remote_reinit()
promisor-remote: implement promisor_remote_get_direct()
Add initial support for many promisor remotes
fetch-object: make functions return an error code
t0410: remove pipes after git commands
commit de67293e74888be95fb499560c1b38fe05b13af7
Merge: 95486229e3 a2bb801f6a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:09 2019 -0700
Merge branch 'sg/line-log-tree-diff-optim'
Optimize unnecessary full-tree diff away from "git log -L" machinery.
* sg/line-log-tree-diff-optim:
line-log: avoid unnecessary full tree diffs
line-log: extract pathspec parsing from line ranges into a helper function
commit 95486229e30ca7075dfcb32f33d9719afb047593
Merge: f76bd8c6b1 5af9d5f6c8
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:08 2019 -0700
Merge branch 'sg/complete-configuration-variables'
Command line completion updates for "git -c var.name=val"
* sg/complete-configuration-variables:
completion: complete config variables and values for 'git clone --config='
completion: complete config variables names and values for 'git clone -c'
completion: complete values of configuration variables after 'git -c var='
completion: complete configuration sections and variable names for 'git -c'
completion: split _git_config()
completion: simplify inner 'case' pattern in __gitcomp()
completion: use 'sort -u' to deduplicate config variable names
completion: deduplicate configuration sections
completion: add tests for 'git config' completion
completion: complete more values of more 'color.*' configuration variables
completion: fix a typo in a comment
commit f76bd8c6b132bdcefd547cb99cb832f433fee544
Merge: a2e524ecf3 bc40ce4de6
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:08 2019 -0700
Merge branch 'js/pre-merge-commit-hook'
A new "pre-merge-commit" hook has been introduced.
* js/pre-merge-commit-hook:
merge: --no-verify to bypass pre-merge-commit hook
git-merge: honor pre-merge-commit hook
merge: do no-verify like commit
t7503: verify proper hook execution
commit a2e524ecf396722020e85b39d7b5e83d7c95ec24
Merge: 128666753b 93b980e58f
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:08 2019 -0700
Merge branch 'cb/curl-use-xmalloc'
Tell cURL library to use the same malloc() implementation, with the
xmalloc() wrapper, as the rest of the system, for consistency.
* cb/curl-use-xmalloc:
http: use xmalloc with cURL
commit 128666753b449bd76315c8f0a10b752c6a97561f
Merge: 917a319ea5 9827d4c185
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:07 2019 -0700
Merge branch 'jk/drop-release-pack-memory'
xmalloc() used to have a mechanism to ditch memory and address
space resources as the last resort upon seeing an allocation
failure from the underlying malloc(), which made the code complex
and thread-unsafe with dubious benefit, as major memory resource
users already do limit their uses with various other mechanisms.
It has been simplified away.
* jk/drop-release-pack-memory:
packfile: drop release_pack_memory()
commit 917a319ea59c130a14cff7656537ba14f593568b
Merge: 7e1976e210 476998d05b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:50:07 2019 -0700
Merge branch 'js/rebase-r-strategy'
"git rebase --rebase-merges" learned to drive different merge
strategies and pass strategy specific options to them.
* js/rebase-r-strategy:
t3427: accelerate this test by using fast-export and fast-import
rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
t3418: test `rebase -r` with merge strategies
t/lib-rebase: prepare for testing `git rebase --rebase-merges`
rebase -r: support merge strategies other than `recursive`
t3427: fix another incorrect assumption
t3427: accommodate for the `rebase --merge` backend having been replaced
t3427: fix erroneous assumption
t3427: condense the unnecessarily repetitive test cases into three
t3427: move the `filter-branch` invocation into the `setup` case
t3427: simplify the `setup` test case significantly
t3427: add a clarifying comment
rebase: fold git-rebase--common into the -p backend
sequencer: the `am` and `rebase--interactive` scripts are gone
.gitignore: there is no longer a built-in `git-rebase--interactive`
t3400: stop referring to the scripted rebase
Drop unused git-rebase--am.sh
commit 7e1976e2100da661e858e3aa12ae2c8d152431c2
Merge: 8a3a6817e2 f7a8834ba4
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 18 11:22:11 2019 -0700
Merge branch 'master' of https://github.com/prati0100/git-gui
* 'master' of https://github.com/prati0100/git-gui:
git-gui: add hotkey to toggle "Amend Last Commit"
git-gui: add horizontal scrollbar to commit buffer
git-gui: convert new/amend commit radiobutton to checkbutton
git-gui: add hotkeys to set widget focus
git-gui: allow undoing last revert
git-gui: return early when patch fails to apply
git-gui: allow reverting selected hunk
git-gui: allow reverting selected lines
commit 66cb68a76a13e6b1ed807febe460a1068b5e55e5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Sep 17 15:52:02 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 028a19d2c4bc46d3fb062aadb70646fb978d918e
Merge: 45a0c1cbc2 b967887aa5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Sep 17 15:29:49 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit b967887aa5316e9ceb19eb5414c9a2debdfd00a9
Merge: c4317032e6 8a3a6817e2
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 17 15:07:52 2019 -0700
Merge branch 'master' into next
* master:
gitk: rename zh_CN.po to zh_cn.po
gitk: Do not mistake unchanged lines for submodule changes
gitk: Use right colour for remote refs in the "Tags and heads" dialog
gitk: Add Chinese (zh_CN) translation
gitk: Make web links clickable
commit 8a3a6817e24ae1cf1fd08fb90b4a99e6817f646d
Merge: 3cb8921f74 2a4ac71ffb
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 17 14:59:18 2019 -0700
Merge gitk to pick up emergency build fix
gitk: rename zh_CN.po to zh_cn.po
commit 2a4ac71ffbbc1c8f6d66cc4d1276ab1c8b7ae3d2
Author: Denton Liu <liu.denton@gmail.com>
Date: Tue Sep 17 01:52:06 2019 -0700
gitk: rename zh_CN.po to zh_cn.po
When running make from a clean environment, all of the *.po files should
be converted into *.msg files. After that, when make is run without any
changes, make should not do anything.
After beffae768a (gitk: Add Chinese (zh_CN) translation, 2017-03-11),
zh_CN.po was introduced. When make was run, a zh_cn.msg file was
generated (notice the lowercase). However, since make is case-sensitive,
it expects zh_CN.po to generate a zh_CN.msg file so make will keep
reattempting to generate a zh_CN.msg so successive make invocations
result in
Generating catalog po/zh_cn.msg
msgfmt --statistics --tcl po/zh_cn.po -l zh_cn -d po/
317 translated messages.
happening continuously.
Rename zh_CN.po to zh_cn.po so that when make generates the zh_cn.msg
file, it will realize that it was successfully generated and only run
once.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3cb8921f74354a3a4aeaa932869acb7e6aabe630
Merge: f1d4a28250 9ea831a2a6
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 16 10:25:08 2019 -0700
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
* 'master' of git://ozlabs.org/~paulus/gitk:
gitk: Do not mistake unchanged lines for submodule changes
gitk: Use right colour for remote refs in the "Tags and heads" dialog
gitk: Add Chinese (zh_CN) translation
gitk: Make web links clickable
commit f7a8834ba4aa20ec750833cf8d30d9a9fed5eade
Merge: 6c8ec8c30a ec7424e1a6
Author: Pratyush Yadav <me@yadavpratyush.com>
Date: Sat Sep 14 23:23:12 2019 +0530
Merge branch 'bp/amend-toggle-bind'
Toggle amend on and off with the keyboard shortcut "Ctrl+e".
* bp/amend-toggle-bind:
git-gui: add hotkey to toggle "Amend Last Commit"
commit ec7424e1a634ba4a509227f003bd9cf31f12b4c2
Author: Birger Skogeng Pedersen <birger.sp@gmail.com>
Date: Sat Sep 14 11:18:35 2019 +0200
git-gui: add hotkey to toggle "Amend Last Commit"
Selecting whether to "Amend Last Commit" or not does not have a hotkey.
With this patch, the user may toggle between the two options with
CTRL/CMD+e.
Signed-off-by: Birger Skogeng Pedersen <birger.sp@gmail.com>
Rebased-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
commit 9ea831a2a6845251b1f322a128d3d35e8b3774c9
Author: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Date: Sat Mar 23 18:00:36 2019 +0100
gitk: Do not mistake unchanged lines for submodule changes
Unchanged lines are prefixed with a white-space, thus unchanged lines
starting with either " <" or " >" are mistaken for submodule changes.
Check if a line starts with either " <" or " >" only if we are listing
the changes of a submodule.
Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
commit d7cc4fb0018e247cb5a05cbe55057bc70d3455af
Author: Paul Wise <pabs3@bonedaddy.net>
Date: Thu Mar 21 15:05:32 2019 +0800
gitk: Use right colour for remote refs in the "Tags and heads" dialog
Makes it easier to see which refs are local and which refs are remote.
Adds consistency with the remote background colour in the graph display.
Signed-off-by: Paul Wise <pabs3@bonedaddy.net>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
commit beffae768aff87ddd690c987a561e8ec61cf3c71
Author: YanKe <imyanke@163.com>
Date: Sat Mar 11 03:00:00 2017 +0800
gitk: Add Chinese (zh_CN) translation
Signed-off-by: YanKe <imyanke@163.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
commit 6c8ec8c30a134a24f90cccae87d33e71a61d4f5b
Merge: acfa495519 da08d559b7
Author: Pratyush Yadav <me@yadavpratyush.com>
Date: Sat Sep 14 02:19:38 2019 +0530
Merge branch 'bw/commit-scrollbuffer'
Add a scrollbar at the bottom of the commit message buffer.
* bw/commit-scrollbuffer:
git-gui: add horizontal scrollbar to commit buffer
commit acfa495519d7c12cfafe1c0e52fdac40f5e41032
Merge: c77abf0460 ba41b5b335
Author: Pratyush Yadav <me@yadavpratyush.com>
Date: Sat Sep 14 02:18:27 2019 +0530
Merge branch 'bw/amend-checkbutton'
Change the amend setting from two radio buttons ("New commit" and "Amend
commit") to a single checkbutton. The two radio buttons can never be
selected together because they are exactly the opposite of each other,
so it makes sense to change it to a single checkbutton.
* bw/amend-checkbutton:
git-gui: convert new/amend commit radiobutton to checkbutton
commit da08d559b714016af532594083fe96120b36f58d
Author: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Fri Sep 13 22:16:28 2019 +0200
git-gui: add horizontal scrollbar to commit buffer
While the commit message widget has a configurable fixed width, it
nevertheless allowed to write commit messages which exceeded this limit.
Though there is no visual clue, that there is scrolling going on. Now
there is a horizontal scrollbar.
There seems to be a bug in at least Tcl/Tk up to version 8.6.8, which
does not update the horizontal scrollbar if one removes the whole
content at once.
Suggested-by: Birger Skogeng Pedersen <birger.sp@gmail.com>
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
commit ba41b5b335b00ac1cb277c83b87ebf3c26b670c0
Author: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Fri Sep 13 08:02:30 2019 +0200
git-gui: convert new/amend commit radiobutton to checkbutton
Its a bi-state anyway and also saves one line in the menu.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
commit 45a0c1cbc24f34790aeef896129d235505d2ebf7
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Sep 13 07:42:35 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 9aa04d7f6f0be2c9993c35110d9b2d53ff35570f
Merge: d9b4005b13 c4317032e6
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Sep 13 07:39:56 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit c77abf04604d74859f3ec81c44cd4ef2b084ebde
Merge: 5a2bb62180 a4fa2f0a4c
Author: Pratyush Yadav <me@yadavpratyush.com>
Date: Thu Sep 12 02:41:12 2019 +0530
Merge branch 'py/revert-hunks-lines'
git-gui learned to revert selected lines and hunks, just like it can
stage selected lines and hunks. To provide a safety net for accidental
revert, the most recent revert can be undone.
* py/revert-hunks-lines:
git-gui: allow undoing last revert
git-gui: return early when patch fails to apply
git-gui: allow reverting selected hunk
git-gui: allow reverting selected lines
commit 5a2bb6218097e7aa73e263c0d7743a477b520101
Merge: 5ab72271e1 e07446ed5f
Author: Pratyush Yadav <me@yadavpratyush.com>
Date: Thu Sep 12 02:40:24 2019 +0530
Merge branch 'bp/widget-focus-hotkeys'
git-gui learned to switch focus between widgets "unstaged commits",
"staged commits", "diff", and "commit message" using the keyboard
shortcuts Alt+1, Alt+2, Alt+3, and Alt+4 respectively.
* bp/widget-focus-hotkeys:
git-gui: add hotkeys to set widget focus
commit e07446ed5ff8b1c291a5c4ba2783bb8c0aa9741a
Author: Birger Skogeng Pedersen <birger.sp@gmail.com>
Date: Wed Sep 4 16:30:55 2019 +0200
git-gui: add hotkeys to set widget focus
The user cannot change focus between the list of files, the diff view and
the commit message widgets without using the mouse (clicking either of
the four widgets).
With this patch, the user may set ui focus to the previously selected path
in either the "Unstaged Changes" or "Staged Changes" widgets, using
ALT+1 or ALT+2.
The user may also set the ui focus to the diff view widget with
ALT+3, or to the commit message widget with ALT+4.
This enables the user to select/unselect files, view the diff and create a
commit in git-gui using keyboard-only.
Signed-off-by: Birger Skogeng Pedersen <birger.sp@gmail.com>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
commit c4317032e6339d557b6adc27df1255b652a990cf
Merge: 9a6619ddab f1d4a28250
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 13:00:44 2019 -0700
Sync with master
* master:
Second batch
commit 9a6619ddab72fb09cc65b6f35fe6b4461e01484b
Merge: 39ccd21475 bd482d6e33
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:37 2019 -0700
Merge branch 'dl/use-sq-from-test-lib' into next
Code cleanup.
* dl/use-sq-from-test-lib:
t: use common $SQ variable
commit 39ccd2147542a62c5483e8f612fc34a0fe8c0897
Merge: 90406d6375 3a37876b5d
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:37 2019 -0700
Merge branch 'jk/misc-uninitialized-fixes' into next
Various fixes to codepaths gcc 9 had trouble following dataflow.
* jk/misc-uninitialized-fixes:
pack-objects: drop packlist index_pos optimization
test-read-cache: drop namelen variable
diff-delta: set size out-parameter to 0 for NULL delta
bulk-checkin: zero-initialize hashfile_checkpoint
pack-objects: use object_id in packlist_alloc()
git-am: handle missing "author" when parsing commit
commit 90406d637524925e7e663145ad09b5a61b664d53
Merge: 0e9489a835 3960290675
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:36 2019 -0700
Merge branch 'sg/git-test-boolean' into next
Fix an earlier regression in the test suite, which mistakenly
stopped running HTTPD tests.
* sg/git-test-boolean:
ci: restore running httpd tests
t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests
commit 0e9489a835b1e70ac66e27d88e023baa03e2030f
Merge: 311ed09ba8 c77722b3ea
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:36 2019 -0700
Merge branch 'rs/get-tagged-oid' into next
Code cleanup.
* rs/get-tagged-oid:
use get_tagged_oid()
tag: factor out get_tagged_oid()
commit 311ed09ba85ae084552295dc999d4d525d35c1fc
Merge: b3bcc2cbc7 483e861111
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:36 2019 -0700
Merge branch 'en/filter-branch-deprecation' into next
Start discouraging the use of "git filter-branch".
* en/filter-branch-deprecation:
t9902: use a non-deprecated command for testing
Recommend git-filter-repo instead of git-filter-branch
t6006: simplify, fix, and optimize empty message test
commit b3bcc2cbc7a1523eeb514421ed329fbac372edf3
Merge: 9db61400c8 27fd1e4ea7
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:36 2019 -0700
Merge branch 'en/merge-options-ff-and-friends' into next
Doc update.
* en/merge-options-ff-and-friends:
merge-options.txt: clarify meaning of various ff-related options
commit 9db61400c81c4cd191085502fbf42a5212e9c459
Merge: 970488992a 8e4c8af058
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:35 2019 -0700
Merge branch 'tg/push-all-in-mirror-forbidden' into next
Fix an earlier regression to "git push --all" which should have
been forbidden when the target remote repository is set to be a
mirror.
* tg/push-all-in-mirror-forbidden:
push: disallow --all and refspecs when remote.<name>.mirror is set
commit 970488992a4f4552f22aed79a8fa78cac48d3955
Merge: 4b00ea1ac9 0a8bc7068f
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:35 2019 -0700
Merge branch 'dt/remote-helper-doc-re-lock-option' into next
Doc update.
* dt/remote-helper-doc-re-lock-option:
clarify documentation for remote helpers
commit 4b00ea1ac98b7e6438a27ba9f68e27865c1fc626
Merge: 97e7e06801 80e3658647
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:34 2019 -0700
Merge branch 'rs/help-unknown-ref-does-not-return' into next
Code cleanup.
* rs/help-unknown-ref-does-not-return:
help: make help_unknown_ref() NORETURN
commit 97e7e068014611fdcda644af1bcb197f11a7a301
Merge: 13d9c4000e 313677627a
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:34 2019 -0700
Merge branch 'nd/switch-and-restore' into next
Resurrect a performance hack.
* nd/switch-and-restore:
checkout: add simple check for 'git checkout -b'
commit 13d9c4000e468aa158b22fdc5866113dcdff3e62
Merge: 70ccc59b4b ebb8d2c90f
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:34 2019 -0700
Merge branch 'tb/file-url-to-unc-path' into next
Windows update.
* tb/file-url-to-unc-path:
mingw: support UNC in git clone file://server/share/repo
commit 70ccc59b4be2f8133f80836bf6fc3cbc06f6270b
Merge: fcd9ee9f1b 5cf7b3b1ac
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:33 2019 -0700
Merge branch 'js/gitdir-at-unc-root' into next
On Windows, the root level of UNC share is now allowed to be used
just like any other directory.
* js/gitdir-at-unc-root:
setup_git_directory(): handle UNC root paths correctly
Fix .git/ discovery at the root of UNC shares
setup_git_directory(): handle UNC paths correctly
commit fcd9ee9f1bfd73f2b81f4b023640d856c7b33c95
Merge: 1973826628 a3f332f4fb
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:33 2019 -0700
Merge branch 'js/honor-cflags-in-hdr-check' into next
Build fix to make sure hdr-check is run with the same preprocessor
macros predefined by the $(MAKE) procedure.
* js/honor-cflags-in-hdr-check:
hdr-check: make it work on Windows
commit 1973826628e7406ce38daccb0826f2e447be9086
Merge: 157e836dba 4e1a641ee3
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:33 2019 -0700
Merge branch 'ar/mingw-run-external-with-non-ascii-path' into next
Windows update.
* ar/mingw-run-external-with-non-ascii-path:
mingw: fix launching of externals from Unicode paths
commit 157e836dbaca61672a6647212dd52ac5af45e5ca
Merge: eeef864077 1577dc0f7c
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:33 2019 -0700
Merge branch 'rs/parse-tree-indirect' into next
Code cleanup.
* rs/parse-tree-indirect:
tree: simplify parse_tree_indirect()
commit eeef864077e79174aeacfc2953fae83289a9502a
Merge: 6c44967c97 1ebec8dfc1
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:32 2019 -0700
Merge branch 'jk/fast-import-history-bugfix' into next
The memory ownership model of the "git fast-import" got
straightened out.
* jk/fast-import-history-bugfix:
fast-import: duplicate into history rather than passing ownership
fast-import: duplicate parsed encoding string
commit 6c44967c97b8b6efc3ee562c7d1c28dad945add4
Merge: e0f6d18a10 60fe477a0b
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:32 2019 -0700
Merge branch 'mh/notes-duplicate-entries' into next
A few implementation fixes in the notes API.
* mh/notes-duplicate-entries:
notes: avoid potential use-after-free during insertion
notes: avoid leaking duplicate entries
commit e0f6d18a10be5dfcebebc492c6d88527db7d997d
Merge: 9fb7485032 60d198d022
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:32 2019 -0700
Merge branch 'tb/banned-vsprintf-namefix' into next
Error message fix.
* tb/banned-vsprintf-namefix:
banned.h: fix vsprintf()'s ban message
commit 9fb74850322961ab007d05366c6da8ee4a23b3a9
Merge: 9971b626f1 9784f97321
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:31 2019 -0700
Merge branch 'mh/release-commit-memory-fix' into next
Leakfix.
* mh/release-commit-memory-fix:
commit: free the right buffer in release_commit_memory
commit 9971b626f1807ca81e6926e15e0389434f4da76f
Merge: f6bba7d52f 7e92756751
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:31 2019 -0700
Merge branch 'mh/http-urlmatch-cleanup' into next
Leakfix.
* mh/http-urlmatch-cleanup:
http: don't leak urlmatch_config.vars
commit f6bba7d52f0a36e2448a7b5351384308afab865e
Merge: 13893cdf8c fd99c2dd9b
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:31 2019 -0700
Merge branch 'rs/strbuf-detach' into next
Straighten out the use of strbuf_detach() API function.
* rs/strbuf-detach:
grep: use return value of strbuf_detach()
log-tree: always use return value of strbuf_detach()
commit 13893cdf8c282d52ce5c80f189c923029441fb06
Merge: b3022b4002 1fd881d404
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:31 2019 -0700
Merge branch 'rs/trace2-dst-warning' into next
Code cleanup.
* rs/trace2-dst-warning:
trace2: use warning() directly in tr2_dst_malformed_warning()
commit b3022b400266dbe8e112e73e207b079fb5c8c1c0
Merge: 49defc07af 50094ca45f
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:30 2019 -0700
Merge branch 'dl/format-patch-doc-test-cleanup' into next
The documentation and tests for "git format-patch" have been
cleaned up.
* dl/format-patch-doc-test-cleanup:
config/format.txt: specify default value of format.coverLetter
Doc: add more detail for git-format-patch
t4014: stop losing return codes of git commands
t4014: remove confusing pipe in check_threading()
t4014: use test_line_count() where possible
t4014: let sed open its own files
t4014: drop redirections to /dev/null
t4014: use indentable here-docs
t4014: remove spaces after redirect operators
t4014: use sq for test case names
t4014: move closing sq onto its own line
t4014: s/expected/expect/
t4014: drop unnecessary blank lines from test cases
commit 49defc07af19d0c7916e501e5892d17f8b713380
Merge: 41ced23598 0c37c41d13
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:30 2019 -0700
Merge branch 'bc/hash-independent-tests-part-5' into next
Preparation for SHA-256 upgrade continues in the test department.
* bc/hash-independent-tests-part-5:
t4009: make hash size independent
t4002: make hash independent
t4000: make hash size independent
t3903: abstract away SHA-1-specific constants
t3800: make hash-size independent
t3600: make hash size independent
t3506: make hash independent
t3430: avoid hard-coded object IDs
t3404: abstract away SHA-1-specific constants
t3306: abstract away SHA-1-specific constants
t3305: make hash size independent
t3301: abstract away SHA-1-specific constants
t3206: abstract away hash size constants
t3201: abstract away SHA-1-specific constants
commit 41ced23598bf0b71ff6c3f1ee51c366747708920
Merge: e33c896e16 e770fbfeff
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:30 2019 -0700
Merge branch 'jc/test-cleanup' into next
Code cleanup.
* jc/test-cleanup:
t3005: remove unused variable
t: use LF variable defined in the test harness
commit e33c896e16c91ae8a1840c7184196cf30378690e
Merge: 5493ee9474 7027f508c7
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:29 2019 -0700
Merge branch 'dl/compat-cleanup' into next
Code cleanup.
* dl/compat-cleanup:
compat/*.[ch]: remove extern from function declarations using spatch
mingw: apply array.cocci rule
commit 5493ee947415b9f4e73739bb60da5c3ecdfc3da2
Merge: c6a4ce50a0 aac6ff7b5b
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:58:29 2019 -0700
Merge branch 'js/visual-studio' into next
Adjust .gitignore to unignore a path that we started to track.
* js/visual-studio:
.gitignore: stop ignoring `.manifest` files
commit f1d4a28250629ae469fc5dd59ab843cb2fd68e12
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:31:27 2019 -0700
Second batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c8ada15456f951913dbf628a7c441032e90b8e11
Merge: 8f3ba423e7 2c65d90f75
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:40 2019 -0700
Merge branch 'bc/reread-attributes-during-rebase'
The "git am" based backend of "git rebase" ignored the result of
updating ".gitattributes" done in one step when replaying
subsequent steps.
* bc/reread-attributes-during-rebase:
am: reload .gitattributes after patching it
path: add a function to check for path suffix
commit 8f3ba423e7149fdbe1d7e1d2f245b4c0a2a1bdfb
Merge: a477abe9e4 58166c2e9d
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:40 2019 -0700
Merge branch 'tg/t0021-racefix'
A test fix.
* tg/t0021-racefix:
t0021: make sure clean filter runs
commit a477abe9e4bdf1dd3627c20b69ed8b51f27c2f81
Merge: d49c2c3466 8b3f33ef11
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:39 2019 -0700
Merge branch 'mp/for-each-ref-missing-name-or-email'
"for-each-ref" and friends that shows refs did not protect themselves
against ancient tags that did not record tagger names when asked to
show "%(taggername)", which have been corrected.
* mp/for-each-ref-missing-name-or-email:
ref-filter: initialize empty name or email fields
commit d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1
Merge: 2743b61bc6 3c81760bc6
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:39 2019 -0700
Merge branch 'sb/userdiff-dts'
Device-tree files learned their own userdiff patterns.
* sb/userdiff-dts:
userdiff: add a builtin pattern for dts files
commit 2743b61bc65156d337c0740da5122b58a044b1a5
Merge: 4c49dd042d 7cfcb16b0e
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:39 2019 -0700
Merge branch 'rs/sort-oid-array-thread-safe'
Prepare get_short_oid() codepath to be thread-safe.
* rs/sort-oid-array-thread-safe:
sha1-name: make sort_ambiguous_oid_array() thread-safe
commit 4c49dd042d34a44b3238ea901aeceeea716ab8e2
Merge: d8b1ce7972 19800bdc3f
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:38 2019 -0700
Merge branch 'nd/diff-parseopt'
Compilation fix.
* nd/diff-parseopt:
parseopt: move definition of enum parse_opt_result up
commit d8b1ce79729b1744727c29ec818c34ec43ee9599
Merge: 8ce8a63b46 a63694f523
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:38 2019 -0700
Merge branch 'jt/diff-lazy-fetch-submodule-fix'
On-demand object fetching in lazy clone incorrectly tried to fetch
commits from submodule projects, while still working in the
superproject, which has been corrected.
* jt/diff-lazy-fetch-submodule-fix:
diff: skip GITLINK when lazy fetching missing objs
commit 8ce8a63b46298501c9afebfea28ed3339a9104b7
Merge: 9437394661 415b770b88
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:38 2019 -0700
Merge branch 'ds/midx-expire-repack'
Code cleanup.
* ds/midx-expire-repack:
packfile.h: drop extern from function declaration
commit 94373946614f864bdcd5e0cb72e360edbed1c77f
Merge: af2b8faf49 24bc1a1292
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:37 2019 -0700
Merge branch 'cb/fetch-set-upstream'
"git fetch" learned "--set-upstream" option to help those who first
clone from their private fork they intend to push to, add the true
upstream via "git remote add" and then "git fetch" from it.
* cb/fetch-set-upstream:
pull, fetch: add --set-upstream option
commit af2b8faf49ff81491872137024a464cdb7a72b10
Merge: fa9e7934c7 71d41ff651
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:37 2019 -0700
Merge branch 'rs/pax-extended-header-length-fix'
"git archive" recorded incorrect length in extended pax header in
some corner cases, which has been corrected.
* rs/pax-extended-header-length-fix:
archive-tar: turn length miscalculation warning into BUG
archive-tar: use size_t in strbuf_append_ext_header()
archive-tar: fix pax extended header length calculation
archive-tar: report wrong pax extended header length
commit fa9e7934c780bc804a09bfc88a93825096b3155e
Merge: d1a251a1fa 1c24a54ea4
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:37 2019 -0700
Merge branch 'bm/repository-layout-typofix'
Typofix.
* bm/repository-layout-typofix:
repository-layout.txt: correct pluralization of 'object'
commit d1a251a1fa686dc98f7e3160143dfa809ec1a51d
Merge: e1151704f2 acb7da05ac
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:36 2019 -0700
Merge branch 'en/checkout-mismerge-fix'
Fix a mismerge that happened in 2.22 timeframe.
* en/checkout-mismerge-fix:
checkout: remove duplicate code
commit e1151704f22ce3de778527047ecfd033e6f1aa83
Merge: f4f8dfe127 64e5e1fba1
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:36 2019 -0700
Merge branch 'sg/diff-indent-heuristic-non-experimental'
We promoted the "indent heuristics" that decides where to split
diff hunks from experimental to the default a few years ago, but
some stale documentation still marked it as experimental, which has
been corrected.
* sg/diff-indent-heuristic-non-experimental:
diff: 'diff.indentHeuristic' is no longer experimental
commit f4f8dfe127918241c1e3448436d32a89f13fa5a8
Merge: 4a12f89865 aaf633c2ad
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:36 2019 -0700
Merge branch 'ds/feature-macros'
A mechanism to affect the default setting for a (related) group of
configuration variables is introduced.
* ds/feature-macros:
repo-settings: create feature.experimental setting
repo-settings: create feature.manyFiles setting
repo-settings: parse core.untrackedCache
commit-graph: turn on commit-graph by default
t6501: use 'git gc' in quiet mode
repo-settings: consolidate some config settings
commit 4a12f89865236789b5723277bb6809e92ce68f54
Merge: b4a1eec332 67feca3b1c
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:35 2019 -0700
Merge branch 'jk/eoo'
The command line parser learned "--end-of-options" notation; the
standard convention for scripters to have hardcoded set of options
first on the command line, and force the command to treat end-user
input as non-options, has been to use "--" as the delimiter, but
that would not work for commands that use "--" as a delimiter
between revs and pathspec.
* jk/eoo:
gitcli: document --end-of-options
parse-options: allow --end-of-options as a synonym for "--"
revision: allow --end-of-options to end option parsing
commit b4a1eec33249344b5c7b978d397259088cafd219
Merge: 70336bd50a 22932d9169
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:35 2019 -0700
Merge branch 'jk/repo-init-cleanup'
Further clean-up of the initialization code.
* jk/repo-init-cleanup:
config: stop checking whether the_repository is NULL
common-main: delay trace2 initialization
t1309: use short branch name in includeIf.onbranch test
commit 70336bd50ad5c17d5aa8f95de4d03888d399adab
Merge: 745f681289 0d88f3d2c5
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Sep 9 12:26:35 2019 -0700
Merge branch 'py/git-gui-do-quit'
"git gui" learned to call the clean-up procedure before exiting.
* py/git-gui-do-quit:
git-gui: call do_quit before destroying the main window
commit d9b4005b13fa1a9694597f6c68463471b3cb20e2
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Sep 9 11:32:03 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit e6bc4507a88a9a42a772f94b3a69df8fe48ff514
Merge: d6607f5171 c6a4ce50a0
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Sep 9 11:27:55 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit bf1e28e0ad9b1d0d04203ebc43b9008de1969503
Author: Ben Wijen <ben@wijen.net>
Date: Fri Aug 30 17:16:06 2019 +0200
builtin/rebase.c: Remove pointless message
When doing 'git rebase --autostash <upstream> <master>' with a dirty worktree
a 'HEAD is now at ...' message is emitted, which is pointless as it refers to
the old active branch which isn't actually moved.
This commit removes the 'HEAD is now at...' message.
Signed-off-by: Ben Wijen <ben@wijen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d2172ef02dee468b85bc4567332cbf58cd6b4b0a
Author: Ben Wijen <ben@wijen.net>
Date: Fri Aug 30 17:16:05 2019 +0200
builtin/rebase.c: make sure the active branch isn't moved when autostashing
Consider the following scenario:
git checkout not-the-master
work work work
git rebase --autostash upstream master
Here 'rebase --autostash <upstream> <branch>' incorrectly moves the
active branch (not-the-master) to master (before the rebase).
The expected behavior: (58794775:/git-rebase.sh:526)
AUTOSTASH=$(git stash create autostash)
git reset --hard
git checkout master
git rebase upstream
git stash apply $AUTOSTASH
The actual behavior: (6defce2b:/builtin/rebase.c:1062)
AUTOSTASH=$(git stash create autostash)
git reset --hard master
git checkout master
git rebase upstream
git stash apply $AUTOSTASH
This commit reinstates the 'legacy script' behavior as introduced with
58794775: rebase: implement --[no-]autostash and rebase.autostash
Signed-off-by: Ben Wijen <ben@wijen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c6a4ce50a0d24c7b512b564eacb00d0bf92b22e4
Merge: 076a48aa57 fddf2ebe38
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Sep 7 09:23:39 2019 -0700
Merge branch 'jt/avoid-ls-refs-with-http' into next
The http transport lacked some optimization the native transports
learned to avoid unnecessary ref advertisement, which has been
corrected.
* jt/avoid-ls-refs-with-http:
transport: teach all vtables to allow fetch first
transport-helper: skip ls-refs if unnecessary
commit 076a48aa577600b39498edacb154f31ef1babb9e
Merge: 46faa86955 90d21f9ebf
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Sep 7 09:23:39 2019 -0700
Merge branch 'md/list-objects-filter-combo' into next
The list-objects-filter API (used to create a sparse/lazy clone)
learned to take a combined filter specification.
* md/list-objects-filter-combo:
list-objects-filter-options: make parser void
list-objects-filter-options: clean up use of ALLOC_GROW
list-objects-filter-options: allow mult. --filter
strbuf: give URL-encoding API a char predicate fn
list-objects-filter-options: make filter_spec a string_list
list-objects-filter-options: move error check up
list-objects-filter: implement composite filters
list-objects-filter-options: always supply *errbuf
list-objects-filter: put omits set in filter struct
list-objects-filter: encapsulate filter components
commit 46faa86955bfd488a2a99d9914835d265806c3ff
Merge: 8d5b7053fd 4ca9474efa
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Sep 7 09:23:38 2019 -0700
Merge branch 'cc/multi-promisor' into next
Teach the lazy clone machinery that there can be more than one
promisor remote and consult them in order when downloading missing
objects on demand.
* cc/multi-promisor:
Move core_partial_clone_filter_default to promisor-remote.c
Move repository_format_partial_clone to promisor-remote.c
Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
remote: add promisor and partial clone config to the doc
partial-clone: add multiple remotes in the doc
t0410: test fetching from many promisor remotes
builtin/fetch: remove unique promisor remote limitation
promisor-remote: parse remote.*.partialclonefilter
Use promisor_remote_get_direct() and has_promisor_remote()
promisor-remote: use repository_format_partial_clone
promisor-remote: add promisor_remote_reinit()
promisor-remote: implement promisor_remote_get_direct()
Add initial support for many promisor remotes
fetch-object: make functions return an error code
t0410: remove pipes after git commands
commit 8d5b7053fd945906504ac0741175301fef723f7e
Merge: 9921f0e536 a2bb801f6a
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Sep 7 09:23:38 2019 -0700
Merge branch 'sg/line-log-tree-diff-optim' into next
Optimize unnecessary full-tree diff away from "git log -L" machinery.
* sg/line-log-tree-diff-optim:
line-log: avoid unnecessary full tree diffs
line-log: extract pathspec parsing from line ranges into a helper function
commit 9921f0e536111b0acb6060dc3d345f6fe281dd76
Merge: 0c9f25399c 5af9d5f6c8
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Sep 7 09:23:38 2019 -0700
Merge branch 'sg/complete-configuration-variables' into next
Command line completion updates for "git -c var.name=val"
* sg/complete-configuration-variables:
completion: complete config variables and values for 'git clone --config='
completion: complete config variables names and values for 'git clone -c'
completion: complete values of configuration variables after 'git -c var='
completion: complete configuration sections and variable names for 'git -c'
completion: split _git_config()
completion: simplify inner 'case' pattern in __gitcomp()
completion: use 'sort -u' to deduplicate config variable names
completion: deduplicate configuration sections
completion: add tests for 'git config' completion
completion: complete more values of more 'color.*' configuration variables
completion: fix a typo in a comment
commit 0c9f25399c8b94980009aa939269356f1774c533
Merge: 07da24f51c bc40ce4de6
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Sep 7 09:23:37 2019 -0700
Merge branch 'js/pre-merge-commit-hook' into next
A new "pre-merge-commit" hook has been introduced.
* js/pre-merge-commit-hook:
merge: --no-verify to bypass pre-merge-commit hook
git-merge: honor pre-merge-commit hook
merge: do no-verify like commit
t7503: verify proper hook execution
commit 07da24f51c2d2f0562747d405094dd9210ef7a0f
Merge: 30f841c42d 93b980e58f
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Sep 7 09:23:37 2019 -0700
Merge branch 'cb/curl-use-xmalloc' into next
Tell cURL library to use the same malloc() implementation, with the
xmalloc() wrapper, as the rest of the system, for consistency.
* cb/curl-use-xmalloc:
http: use xmalloc with cURL
commit 30f841c42d0e2d98fb0886203a53caac1c8fad05
Merge: 71e2451f6c 9827d4c185
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Sep 7 09:23:37 2019 -0700
Merge branch 'jk/drop-release-pack-memory' into next
xmalloc() used to have a mechanism to ditch memory and address
space resources as the last resort upon seeing an allocation
failure from the underlying malloc(), which made the code complex
and thread-unsafe with dubious benefit, as major memory resource
users already do limit their uses with various other mechanisms.
It has been simplified away.
* jk/drop-release-pack-memory:
packfile: drop release_pack_memory()
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}