This implements --pickaxe-raw-diff as explained in 2/2. I based this
on "next" because Duy's in-flight diff option refactoring would have
conflicted with it.
Ævar Arnfjörð Bjarmason (2):
diffcore-pickaxe: refactor !one or !two case in diff_grep
diffcore-pickaxe: add --pickaxe-r
On Fri, Mar 08 2019, Jonathan Tan wrote:
> One relatively significant change: someone pointed out that the issue fixed by
> 50d3413740 ("http: make redirects more obvious", 2016-12-06) could also
> occur here, so I have changed it so that the server is required to send
> the packfile's hash alon
On Wed, Apr 24 2019, Jonathan Nieder wrote:
> Hi,
>
> brian m. carlson wrote:
>
>> I've talked with some people about this approach, and they've indicated
>> they would prefer a configuration-based approach.
>
> I would, too, mostly because that reduces the problem of securing
> hooks to securin
On Wed, Apr 24 2019, brian m. carlson wrote:
> On Wed, Apr 24, 2019 at 11:09:10AM +0900, Junio C Hamano wrote:
>> "brian m. carlson" writes:
>>
>> > To preserve backwards compatibility, we don't run the hooks in the ".d"
>> > directory if the single file is a valid hook (i.e. it exists and is
>
On Wed, Apr 24 2019, brian m. carlson wrote:
> Oftentimes, people want to use multiple of the same kind of hook. This
> may be because software or a project they use requires a given hook, but
> they would also like to have a custom hook, or because they're using
> multiple pieces of software th
On Wed, Apr 24 2019, Jonathan Nieder wrote:
> Ævar Arnfjörð Bjarmason wrote:
>> On Wed, Apr 24 2019, Jonathan Nieder wrote:
>>> Jeff King wrote:
>>>> On Fri, Mar 08, 2019 at 01:55:17PM -0800, Jonathan Tan wrote:
>
>>>>> +If the 'packfil
On Wed, Apr 24 2019, Jonathan Nieder wrote:
> brian m. carlson wrote:
brian: I'm very interested in this. I barked up this tree before almost
exactly 3 years ago:
https://public-inbox.org/git/cacbzzx6j6q2dun_z-pnent1u714dvnpfbrl_pieqylmczlu...@mail.gmail.com/
https://public-inbox.org
On Wed, Apr 24 2019, Jonathan Nieder wrote:
> Hi,
>
> Ævar Arnfjörð Bjarmason wrote:
>
>> This is really orthagonal to this series, but wouldn't a better
>> resumption strategy here be to walk the pack we just downloaded, run the
>> equivalent of 'commit
On Wed, Apr 24 2019, Jonathan Nieder wrote:
> Hi,
>
> Jeff King wrote:
>> On Fri, Mar 08, 2019 at 01:55:17PM -0800, Jonathan Tan wrote:
>
>>> +If the 'packfile-uris' feature is advertised, the following argument
>>> +can be included in the client's request as well as the potential
>>> +addition
On Tue, Apr 23 2019, Jonathan Tan wrote:
>> The problem I see is that the client doesn't get to vet the list of
>> URIs; it only gets to specify a protocol match. But there are many other
>> reasons it might want to reject a URI: we don't like the protocol, the
>> domain name is on a blacklist (
On Mon, Apr 22 2019, Jeff King wrote:
> On Mon, Apr 22, 2019 at 08:01:15PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> > Your patch is optionally removing the "woah, we got an object with a
>> > duplicate sha1, let's check that the bytes are the same in bot
On Mon, Apr 22 2019, Jeff King wrote:
> On Sat, Apr 20, 2019 at 09:59:12AM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>> > If you don't mind losing the collision-detection, using openssl's sha1
>> > might help. The delta resolution should be threaded, too. S
On Mon, Apr 22 2019, Andrew Janke wrote:
> On 4/21/19 8:35 PM, Duy Nguyen wrote:
>> On Sun, Apr 21, 2019 at 6:40 PM Andrew Janke wrote:
>>>
>>> Hi, Git folks,
>>>
>>> This is a follow-up to https://marc.info/?l=git&m=154757938429747&w=2.
>>
>> This says the problem with "en" detection has been
On Sat, Apr 20 2019, Jeff King wrote:
> On Fri, Apr 19, 2019 at 03:47:22PM -0600, Martin Fick wrote:
>
>> I have been thinking about this problem, and I suspect that this compute time
>> is actually spent doing SHA1 calculations, is that possible? Some basic back
>> of the envelope math and scri
On Wed, Apr 17 2019, Giuseppe Crinò wrote:
> The feature I'm asking is to add an extra-step during rebasing,
> checking whether there's a reference to a commit that's not going to
> be included in history and asks the user whether the heuristics is
> correct and if she wants to update those refe
t;this option
doesn't contribute to abbreviation ambiguity". I was going to add a
new PARSE_OPT_NOABBREV flag, but it makes sense just to re-use
PARSE_OPT_NOCOMPLETE.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
See
https://public-inbox.org/git/20190325202329.26033-1-ava...@gmail.com/
for v1. Th
On Wed, Apr 17 2019, Phillip Wood wrote:
> On 16/04/2019 15:51, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Tue, Apr 16 2019, Junio C Hamano wrote:
>>
>>> * pw/rebase-i-internal-rfc (2019-03-21) 12 commits
>>> - rebase -i: run without forking rebase--i
On Tue, Apr 16 2019, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> On Tue, Apr 16 2019, Junio C Hamano wrote:
>>
>>
>>> * jc/gettext-test-fix (2019-04-15) 1 commit
>>> - gettext tests: export the restored GIT_TEST_GETTEXT_POISON
>&g
On Tue, Apr 16 2019, Junio C Hamano wrote:
> * jc/gettext-test-fix (2019-04-15) 1 commit
> - gettext tests: export the restored GIT_TEST_GETTEXT_POISON
>
> The GETTEXT_POISON test option has been quite broken ever since it
> was made runtime-tunable, which has been fixed.
>
> Will merge to
On Sat, Apr 06 2019, Denton Liu wrote:
> On Sat, Apr 06, 2019 at 09:44:49PM +0200, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Mon, Apr 01 2019, Denton Liu wrote:
>>
>> > Thanks again for your feedback, Ævar! I think we're both on the same page
>> > no
On Sat, Apr 13 2019, Randall S. Becker wrote:
> I am encountering a problem on one of our NonStop platform variants where
> the GIT_SSH_COMMAND string is not being broken into constituent parts. This
> is causing SSH to not run properly. As background, SSH is not in a standard
> location and has
On Tue, Apr 09 2019, Nguyễn Thái Ngọc Duy wrote:
> Here's the replacement patch that keeps "git clean" behavior the same
> as before and only checks 'precious' attribute when --keep-precous is
> specified.
Cool to have the expected interaction with -x. Thanks.
> -'git clean' [-d] [-f] [-i]
On Wed, Apr 10 2019, Barret Rhoden wrote:
> init_skiplist() took a file consisting of SHA-1s and comments and added
> the objects to an oidset. This functionality is useful for other
> commands.
This change would be much easier to review if you led with a commit
where you s/Invalid SHA-1/inval
On Wed, Apr 10 2019, Barret Rhoden wrote:
(Just skimming)
> revisions for commits that perform mass reformatting, and their users
> have the optional to ignore all of the commits in that file.
s/have the optional/have the option/
> +--ignore-revs-file ::
> + Ignore revisions listed in `fi
On Thu, Mar 14 2019, Eric Wong wrote:
> Jeff King wrote:
>> On Wed, Mar 13, 2019 at 01:51:33AM +, Eric Wong wrote:
>>
>> > But I did find Ævar's forgotten gitperformance doc and thread
>> > where the topic was brought up:
>> >
>> > https://public-inbox.org/git/20170403211644.26814-1-ava..
On Tue, Apr 09 2019, Taylor Blau wrote:
> Hi Ævar,
>
> On Sun, Apr 07, 2019 at 11:00:19PM +0200, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Fri, Apr 05 2019, Jeff King wrote:
>>
>> > On Fri, Apr 05, 2019 at 08:42:29PM +0200, SZEDER Gábor wrote:
>> >
&
On Tue, Apr 09 2019, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>>> Yup. Just wanted to get the patch to test what we do *currently* out,
>>> might loop back to finishing up the rest of this.
>>
>> Junio: *ping* about picking up this trivial
On Fri, Mar 29 2019, Ævar Arnfjörð Bjarmason wrote:
> On Fri, Mar 29 2019, Jeff King wrote:
>
>> On Thu, Mar 28, 2019 at 09:04:56PM +0100, Ævar Arnfjörð Bjarmason wrote:
>>
>>> Add a test for the error() case in alt_odb_usable() where an alternate
>>> direct
On Mon, Apr 08 2019, SZEDER Gábor wrote:
> On Mon, Apr 08, 2019 at 02:44:59PM +0200, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Mon, Apr 08 2019, SZEDER Gábor wrote:
>>
>> > When 'git blame' is invoked without specifying the commit to start
>> > bl
On Mon, Apr 08 2019, Duy Nguyen wrote:
> On Mon, Apr 8, 2019 at 8:34 AM Junio C Hamano wrote:
>>
>> Damien Robert writes:
>>
>> > is there a way to do a git pull without it running git fetch?
>> > Looking at the source in builtin/pull.c does not seem to indicate so.
>>
>> The reason behind tha
On Mon, Apr 08 2019, SZEDER Gábor wrote:
> When 'git blame' is invoked without specifying the commit to start
> blaming from, it starts from the given file's state in the work tree.
> However, when invoked in a bare repository without a start commit,
> then there is no work tree state to start f
On Fri, Apr 05 2019, Jeff King wrote:
> On Fri, Apr 05, 2019 at 08:42:29PM +0200, SZEDER Gábor wrote:
>
>> > > Don't run git commands upstream of a pipe, because the pipe hides
>> > > their exit code. This applies to several other tests below as well.
>> >
>> > I disagree with that rule here. W
On Sat, Apr 06 2019, Philip Oakley wrote:
> While the minimum is 7-char, the unambiguous length can be longer.
>
> Signed-off-by: Philip Oakley
> ---
> noticed while looking int the Git-for-Windows patch thicket -
> was looking for the ~n^m style!
> ---
> Documentation/git-describe.txt | 2 +-
v4 fixes a misbalanced quote noted by Todd Zullinger in
<20190330180415.gc4...@pobox.com>, and makes this equivalent to the
post-squash version sitting in gitster/ab/gc-docs now.
Ævar Arnfjörð Bjarmason (11):
gc docs: modernize the advice for manually running "gc"
gc docs: sto
what we enumerate explicitly.
So let's say "other refs", even though just above we say "objects that
are referenced anywhere in your repository".
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/git-gc.txt | 4 ++--
1 file changed, 2 insertions(+), 2 dele
initially introduced in
d5d5d7b641 ("gc: automatically write commit-graph files", 2018-06-27).
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config/gc.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/config/gc.txt b/Documentation/confi
equent change is about to remove all this
documentation and replace it with an include of the gc.* docs in
git-config(1). By first changing this it's easier to reason about that
subsequent change.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/git-gc.txt | 5 ++---
1 file changed
at it really does, and let the user draw their own
conclusions.
Let's also clarify the "The effects [...] are persistent" to
paraphrase a brief version of Jeff King's explanation at [1].
1. https://public-inbox.org/git/20190318235356.gk29...@sigill.intra.peff.net/
Signed-off-b
Re-flow the "gc.*" section in "config". A previous commit moved this
over from the "gc" docs, but tried to keep as many of the lines
identical to benefit from diff's move detection.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config/gc.txt | 17 +
expense of runtime performance, which is usually the opposite of
someone who'd like "aggressive gc" wants.
But that's left us with a mostly-redundant configuration variable, so
let's clearly note in its documentation that it doesn't change the
default.
ch I'm keeping as it helps
explain things) because it e.g. also packs the newly imported refs.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/git-fast-import.txt | 7 +++
1 file changed, 7 insertions(+)
diff --git a/Documentation/git-fast-import.txt
b/Documentation/git-fa
;.
Well, it is in the sense that a blocking "gc" would stop you from
doing anything else in *that* particular terminal window, but users
are likely to have another window, or to be worried about how
concurrent "gc" on a server might cause corruption.
Signed-off-by: Ævar Arnfjör
than
the previous "the amount of memory is estimated not enough".
Suggested-by: Jeff King
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/git-gc.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index
were saying something the "gc"
docs in git-config(1) didn't cover move the relevant section over to
the git-config(1) docs.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config/gc.txt | 29 -
Documentation/git-gc.txt| 86 +++
e gc.auto
documentation below.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/git-gc.txt | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index a7c1b0f60e..dd22eecc79 100644
--- a/Documentat
On Thu, Apr 04 2019, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Thu, Apr 4, 2019 at 5:29 PM Junio C Hamano wrote:
>>> * nd/precious (2019-04-01) 1 commit
>>> - Introduce "precious" file concept
>>>
>>> "git clean" learned to pay attention to the 'precious' attributes
>>> and keep un
On Thu, Apr 04 2019, Junio C Hamano wrote:
> * dl/rebase-i-keep-base (2019-04-03) 4 commits
> - rebase: teach rebase --keep-base
> - rebase: fast-forward --onto in more cases
> - t3432: test rebase fast-forward behavior
> - t3431: add rebase --fork-point tests
>
> "git rebase --keep-base "
On Mon, Apr 01 2019, Denton Liu wrote:
> Thanks again for your feedback, Ævar! I think we're both on the same page now.
> Hopefully I've addressed all of your high-level concerns with this patchset
> and
> we can move into a discussion on implementation detail.
Late in replying to this, have b
On Thu, Apr 04 2019, Junio C Hamano wrote:
Just comments on ab/* stuff:
> * ab/gc-reflog (2019-04-01) 7 commits
> - gc: handle & check gc.reflogExpire config
> - reflog tests: assert lack of early exit with expiry="never"
> - reflog tests: test for the "points nowhere" warning
> - reflog te
[1].
1. See Documentation/technical/api-trace2.txt --
https://github.com/git/git/blob/master/Documentation/technical/api-trace2.txt
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config/blame.txt | 10 ++
Documentation/git-blame.txt| 3 ++-
Documentation/git-praise.
ame". There are
some automated users who use "blame" but don't use the "--porcelain"
format (which was already excluded). Those can set
e.g. "error:interactive" to only emit errors when "blame" is
interacting with a TTY.
Signed-off-by: Ævar
On Sat, Mar 30 2019, Elijah Newren wrote:
I may have more, just quickly skimming this for the first time...
> merge.renames::
> - Whether and how Git detects renames. If set to "false",
> - rename detection is disabled. If set to "true", basic rename
> - detection is enabled. Def
commands we're going to execute, not just those within
test_expect_*().
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/test-lib.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 562c57e685..f6318c54c9 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -
On Fri, Mar 29 2019, Jeff Hostetler via GitGitGadget wrote:
> From: Jeff Hostetler
>
> Teach Windows version of git to report peak memory usage
> during exit() processing.
>
> Signed-off-by: Jeff Hostetler
> ---
> common-main.c| 2 +-
> compat/win32/trace2_win32_p
On Fri, Mar 29 2019, Jeff Hostetler via GitGitGadget wrote:
> From: Jeff Hostetler
>
> Update SID component construction to use the current UTC datetime
> and a portion of the SHA1 of the hostname.
>
> Use an simplified date/time format to make it easier to use the
> SID component as a logfile
On Fri, Mar 29 2019, Jeff King wrote:
> On Thu, Mar 28, 2019 at 09:04:56PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
>> Add a test for the error() case in alt_odb_usable() where an alternate
>> directory doesn't exist. This behavior has been the same since
>> 26125f6b
always
>> follow symlinks and make the hardlink be to the pointed file. With this,
>> besides standardizing the behaviour, no broken symlinks will be
>> produced. Also, add tests for symlinked files at .git/objects/.
>>
>> Note: Git won't create symlinks at .git
> set_fake_editor call to 'rebase -i --onto master...side'.
>
> While we're documenting the --keep-base option, change an instance of
> "merge-base" to "merge base", which is the consistent spelling.
>
> Helped-by: Eric Sunshine
> Helped-by: Ju
On Thu, Mar 28 2019, Eric Sunshine wrote:
> On Thu, Mar 28, 2019 at 1:17 PM Christian Couder
> wrote:
>> Otherwise the error from `git rev-parse` is uselessly
>> polluting the debug output.
>>
>> Signed-off-by: Christian Couder
>> ---
>> diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
>>
should die() in that case, but let's start by adding a test
here to assert the long-standing existing behavior.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Unchanged from a 3-part series I submitted in December:
https://public-inbox.org/git/20181204132716.19208-1-ava...@gmail.com/
Part of try
e lines we're going to keep.
So let's assert that we're going to loop over all the references even
when this configuration is in effect.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t1410-reflog.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/t/t1410
point
in doing that. It also couldn't be done without coming up with some
generalized version of the magical "objects/17" directory. See [2] for
a discussion of that directory.
1. https://public-inbox.org/git/874l84ber7....@evledraar.gmail.com/
2. https://public-inbox.org/git/87k1mta9x5.
ssue mhaggerty noted & submit that independently
later, but this should be ready for queuing & moving down to next,
since (unlike the previous 8/8) none of it's tricky code we need to be
really careful with.
Ævar Arnfjörð Bjarmason (7):
gc: remove redundant check for gc_auto_threshold
gc
ny_loose_objects() from within
need_to_gc() itself, which will return if this condition holds, and in
cmd_gc() which will return before ever getting to "auto_gc &&
too_many_loose_objects()" if "auto_gc && !need_to_gc()" is true
earlier in the function.
Signed-off-by
the reasons noted in the earlier "assert lack of early exit"
change I don't think it's worth it to bend over backwards in "git
reflog expire" itself to carefully detect if we'll really do
nothing given the combination of all its possible options and s
n
case a future change is tempted to take shortcuts in the presence of
such config.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t1410-reflog.sh | 10 ++
1 file changed, 10 insertions(+)
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 42f5ac9ed9..e8f8ac9785 100755
--- a/t/t141
Change a couple of tests that weren't using the helper to use it. This
makes the trailing "--unset" unnecessary.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
t/t1410-reflog.sh | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/t/t1410-reflog.sh b/t/
; variables, so let's not leave the reader wondering if
they're being zero'd out for later use somewhere else.
Signed-off-by: Jeff King
Signed-off-by: Ævar Arnfjörð Bjarmason
---
builtin/gc.c | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/builtin/gc.c
On Thu, Mar 28 2019, Jeff Hostetler via GitGitGadget wrote:
Thanks for working on this!
Haven't given this any deep testing. Just some observations:
> From: Jeff Hostetler
>
> Teach git to read the system config (usually "/etc/gitconfig") for
> default Trace2 settings. This allows system-wid
On Thu, Mar 28 2019, Victor wrote:
> Any plans to fix this?
No. I just thought I'd peek at it for a sec, sorry. Maybe someone else
is interested it poking it some more.
> On Thu, 28 Mar 2019 14:16:43 +0100
> Ævar Arnfjörð Bjarmason wrote:
>>
>> On Thu,
On Thu, Mar 28 2019, Victor wrote:
> Hello.
>
> $ git log include/__vic/mutex.h
> commit 9429293f8f8fb0819c77cf1f723567f6edc8fb6a
> Merge: 96dd9a2 f484f4e
> Author: __vic <__...@ngs.ru>
> Date: 2017-12-13 10:41:32 +0300
>
> Merge branch 'generic' into posix
>
> commit f484f4e8aae32041ba56bdc
On Tue, Mar 26 2019, Denton Liu wrote:
> Hi Ævar,
>
> On Tue, Mar 26, 2019 at 09:35:48PM +0100, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Tue, Mar 26 2019, Denton Liu wrote:
>>
>> > Hi Ævar,
>> >
>> > On Tue, Mar 26, 2019 at 03:35:34PM +0100,
On Wed, Mar 27 2019, SZEDER Gábor wrote:
> On Wed, Mar 27, 2019 at 12:21:55PM +0100, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Wed, Mar 27 2019, SZEDER Gábor wrote:
>>
>> > On Wed, Mar 27, 2019 at 11:09:18AM +0100, Ævar Arnfjörð Bjarmason wrote:
>> >> &g
On Wed, Mar 27 2019, SZEDER Gábor wrote:
> On Wed, Mar 27, 2019 at 11:09:18AM +0100, Ævar Arnfjörð Bjarmason wrote:
>> > There are likewise several that use one of
>> >! test -e path/to/filename
>> > or
>> >! test -f path/to/filename
>> >
On Wed, Mar 27 2019, Elijah Newren wrote:
> On Tue, Mar 26, 2019 at 12:56 AM Denton Liu wrote:
>>
>> Robert Dailey reported confusion on the mailing list about a recursive
>> tag which was most likely created by mistake. Jeff King noted that this
>> isn't a very common case so, most likely, cre
On Tue, Mar 26 2019, Elijah Newren wrote:
> Hi,
>
> On Tue, Mar 26, 2019 at 2:10 PM Mooga wrote:
>>
>> Hi,
>> I am still a bit confused about the task itself
>>
>> it’s just text replacing for example:
>> t1400-update-ref.sh , line 194 -> `test_path_is_missing` has to be
>> ‘test_path_is_file
On Tue, Mar 26 2019, Denton Liu wrote:
> Hi Ævar,
>
> On Tue, Mar 26, 2019 at 03:35:34PM +0100, Ævar Arnfjörð Bjarmason wrote:
>>
>> On Sat, Mar 23 2019, Denton Liu wrote:
>>
>> > This series teaches rebase the --keep-base option.
>> >
>> >
On Mon, Mar 25 2019, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin
>
> Since 7ded055401 (build: do not install git-remote-testgit, 2013-06-07),
> we do not install it. Therefore it makes no sense to document it,
> either.
>
> Signed-off-by: Johannes Schindelin
> ---
>
On Sat, Mar 23 2019, Denton Liu wrote:
> This series teaches rebase the --keep-base option.
>
> 'git rebase --keep-base ' is equivalent to
> 'git rebase --onto ... ' or
> 'git rebase --onto $(git merge-base HEAD) ' .
>
> This seems to be a common case that people (including myself!) run into; I
On Tue, Mar 26 2019, Duy Nguyen wrote:
> On Tue, Mar 26, 2019 at 1:29 PM Ævar Arnfjörð Bjarmason
> wrote:
>> I don't see how a new "abbreviatedOptions" is plausibly going to crowd
>> out anything else, sounds pretty unambiguous to me.
>
> By crowded
On Tue, Mar 26 2019, Denton Liu wrote:
> Signed-off-by: Denton Liu
> ---
> Documentation/git-tag.txt | 7 ++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
> index a74e7b926d..7e7eb9a7e9 100644
> --- a/Documentation/
On Tue, Mar 26 2019, Denton Liu wrote:
> Add tests to ensure that recursive tags are disallowed unless the
> "--allow-recursive-tag" option is provided.
>
> Signed-off-by: Denton Liu
> ---
> t/t7004-tag.sh | 8
> 1 file changed, 8 insertions(+)
>
> diff --git a/t/t7004-tag.sh b/t/t700
On Tue, Mar 26 2019, Denton Liu wrote:
> static const char * const git_tag_usage[] = {
> - N_("git tag [-a | -s | -u ] [-f] [-m | -F ]
> []"),
> + N_("git tag [-a | -s | -u ] [-f] [-m | -F ]
> [--allow-recursive-tag]\n"
> + "\t\t []"),
> N_("git tag -d ..."),
> -
On Tue, Mar 26 2019, Jeff King wrote:
> On Tue, Mar 26, 2019 at 08:22:23AM +0900, Mike Hommey wrote:
>
>> Recently, I've noticed that whenever the auto-gc message shows up about
>> being spawned in the background, it still takes a while for git to
>> return to the shell.
>>
>> I've finally looke
On Tue, Mar 26 2019, Duy Nguyen wrote:
> On Tue, Mar 26, 2019 at 5:48 AM Ævar Arnfjörð Bjarmason
> wrote:
>>
>>
>> On Mon, Mar 25 2019, Eric Sunshine wrote:
>>
>> > On Mon, Mar 25, 2019 at 4:23 PM Ævar Arnfjörð Bjarmason
>> > wrote:
&g
On Mon, Mar 25 2019, Eric Sunshine wrote:
> On Mon, Mar 25, 2019 at 4:23 PM Ævar Arnfjörð Bjarmason
> wrote:
>> diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
>> @@ -1,3 +1,15 @@
>> +core.abbreviatedOptions::
>> + Defaults to `tr
On Mon, Mar 25 2019, Denton Liu wrote:
> Hi Johannes,
>
> Thanks for catching this. Perhaps I should've been more diligent and ran
> the entire test suite before submitting but I was running low on
> batteries only ran the rebase-related tests.
>
> On Mon, Mar 25, 2019 at 11:14:23AM -0700, Johan
t;this option
doesn't contribute to abbreviation ambiguity". I was going to add a
new PARSE_OPT_NOABBREV flag, but it makes sense just to re-use
PARSE_OPT_NOCOMPLETE.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
builtin/clone.c | 4 ++--
parse-options.c | 3 ++-
parse-options.h
eing
added, but I think that's more sane than introducing a "bool but not
in the same way as the rest" GIT_TEST_* variable.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config/core.txt | 12
parse-options.c | 19 +++-
;s worth it to go for the route I
took here, and if so to rebase the whole thing or not.
While I'm at it fix a bug I noticed a while ago in 2/2 related to the
option abbreviation being silly and tripping over itself over an
aliased option.
Ævar Arnfjörð Bjarmason (2):
parse-options
On Mon, Mar 25 2019, Johannes Schindelin via GitGitGadget wrote:
> +# Disallow the use of abbreviated options in the test suite by default
> +test -n "$GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS" || {
> + GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=true
> + export GIT_TEST_DISALLOW_ABBREVIATED_OPTI
On Mon, Mar 25 2019, Jeff King wrote:
> On Mon, Mar 25, 2019 at 08:50:14AM -0500, Robert Dailey wrote:
>
>> On Thu, Mar 21, 2019 at 2:29 PM Jeff King wrote:
>> > Tags can point to any object, including another tag. It looks like
>> > somebody made an annotated tag of an annotated tag (probably
ser a hint as to where to look.
While I'm at it mark some of the strings that hadn't been marked for
translation. It's clear from the commit history and the code that this
was merely forgotten at the time, and wasn't intentional.p5
Signed-off-by:
Use the recently split-up components of the corrupt_graph_and_verify()
function to assert that we error on graphs that are too small. The
error was added in 2a2e32bdc5 ("commit-graph: implement git
commit-graph read", 2018-04-10), but there was no test for it.
Signed-off-by: Æva
rr is what we expect.
This allows for re-using everything except the now slimmer
corrupt_graph_and_verify() to corrupt the graph in a way that doesn't
involve inserting a given byte sequence at a given position,
e.g. truncating it entirely to a custom value.
Signed-off-by: Ævar Arnfjörð Bjarm
ally write a new graph file with everything
that's missing. In that case the new graph writing code just needs to
continue to use e.g. a parse_commit() that doesn't consult the
existing commit-graphs.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
commit-graph.c | 10 +++
ase for consistency.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
builtin/commit-graph.c | 4 ++--
commit-graph.c | 7 +++
commit-graph.h | 3 +--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 32bcc63427..819
#x27;t error out when the file
doesn't exist.
But let's not be overly promiscuous in what we accept. If we can't
read the file for other reasons, e.g. permission errors, bad file
descriptor etc. we'd like to report an error to the user.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
b
Changing that is OK. Various errors it emits now early on are prefixed
with "error: ", moving these over and changing the output doesn't
break anything.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
commit-graph.c | 43 -
t/t5318-commi
e.
This leaves load_commit_graph_one() unused by everything except the
internal prepare_commit_graph_one() function, so let's mark it as
"static". If someone needs it in the future we can remove the "static"
attribute. I could also rewrite its sole remaining
user ("prepare
301 - 400 of 3543 matches
Mail list logo
