[PATCH] log: if --decorate is not given, default to --decorate=auto

Git's branching and merging system can be confusing, especially to new users. When teaching people Git, I tell them to set log.decorate=auto. This preference greatly improves the user's awareness of the local and remote branches. So for the sake of user friendliness, I'd like to change the default

Re: [PATCH/RFC V2] stash: implement builtin stash

On Mon, Mar 13, 2017 at 03:23:18PM -0700, Joel Teichroeb wrote: > I've been working on rewriting git stash as a c builtin and I have all > but three tests passing. I'm having a bit of trouble fixing them, as > well as a few other issues, so I'd really appreciate some help. Don't > bother

Re: Use base32?

On 20/03/2017 19:05, Jacob Keller wrote: On Sun, Mar 19, 2017 at 10:58 PM, Michael Steuer wrote: [..] If base32 is being considered, I'd suggest the "base32hex" variant, which uses the same amount of space. I don't see the benefit of adding characters like 0

Please reply ASAP (For Alex)

Dear Friend, I want to introduce my self to you. I am Mr. Alex Lee a banker. I work in a bank here in Seoul, Korea. I have been the account officer to most Koreans government official till date. I discovered a Dormant account with a lot of money. I need your bank account to transfer the money

Re: Why "You cannot combine --squash with --no-ff" in git merge?

Hi All, I made a mistake in the previous message. I'm really sorry, I need to go have some sleep right now. Anatoly Borodin wrote: > `git merge --squash --ff` will happily move the A ref to the B commit. > > But what I want, and expect, is: > > A---B' > >

Re: [PATCH 0/5] t1400: modernize style

On Mon, Mar 20, 2017 at 08:56:11PM -0400, Kyle Meyer wrote: > These patches follow up on Peff's suggestion to modernize the style in > t1400-update-ref.sh. > > 20170217082253.kxjezkxfqkfxj...@sigill.intra.peff.net > > The first two commits aren't concerned with "modernizing" the tests, >

Re: [PATCH 5/5] t1400: use test_when_finished for cleanup

On Mon, Mar 20, 2017 at 08:56:16PM -0400, Kyle Meyer wrote: > Move cleanup lines that occur after test blocks into > test_when_finished calls within the test bodies. Don't move cleanup > lines that seem to be related to mutiple tests rather than a single > test. Sounds logical. The patch looks

Re: Safe to use stdatomic.h?

"brian m. carlson" wrote: > I could support the argument for ditching RHEL/CentOS 5 support, but I > expect other people might disagree. After all, we're still targeting > C89. Yeah, I still use and support CentOS 5 in some places (but maybe not git, still using

Why "You cannot combine --squash with --no-ff" in git merge?

Hi All, the message "You cannot combine --squash with --no-ff" appeared in 2008, in the commit 1c7b76be7d620bbaf2e6b8417f04012326bbb9df ("Build in merge"). I don't understand the logic of this restriction. Imagine, I have the following branches, where A is a master and B is a feature branch:

Re: [PATCH 2/5] t1400: set core.logAllRefUpdates in "logged by touch" tests

On Mon, Mar 20, 2017 at 08:56:13PM -0400, Kyle Meyer wrote: > A group of update-ref tests verifies that logs are created when either > the log file for the ref already exists or core.logAllRefUpdates is > "true". However, when the default for core.logAllRefUpdates was > changed in 0bee59186

Re: [PATCH 4/5] t1400: remove a set of unused output files

On Mon, Mar 20, 2017 at 08:56:15PM -0400, Kyle Meyer wrote: > This test case redirects stdout and stderr to output files, but, > unlike the other cases of redirection in the t1400 tests, these files > are not examined downstream. Remove the redirection so that the > output is visible when

Re: [PATCH 3/5] t1400: use test_path_is_* helpers

On Mon, Mar 20, 2017 at 08:56:14PM -0400, Kyle Meyer wrote: > diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh > index be8b113b1..c5c8e95fc 100755 > --- a/t/t1400-update-ref.sh > +++ b/t/t1400-update-ref.sh > @@ -49,7 +49,7 @@ test_expect_success "fail to delete $m with stale ref" ' >

Re: [PATCH 1/5] t1400: rename test descriptions to be unique

On Mon, Mar 20, 2017 at 08:56:12PM -0400, Kyle Meyer wrote: > A few tests share their description with another test. Extend the > descriptions to indicate how the tests differ. > > Signed-off-by: Kyle Meyer Makes sense, and your descriptions look good. -Peff

[PATCH 6/6] bundle: use prefix_filename with bundle path

We may take the path to a bundle file as an argument, and need to adjust the filename based on the prefix we discovered while setting up the git directory. We do so manually into a fixed-size buffer, but using prefix_filename() is the normal way. Besides being more concise, there are two subtle

[PATCH 5/6] prefix_filename: simplify windows #ifdef

The prefix_filename function used to do an early return when there was no prefix on non-Windows platforms, but always allocated on Windows so that it could call convert_slashes(). Now that the function always allocates, we can unify the logic and make convert_slashes() the only conditional part.

[PATCH 4/6] prefix_filename: return newly allocated string

The prefix_filename() function returns a pointer to static storage, which makes it easy to use dangerously. We already fixed one buggy caller in hash-object recently, and the calls in apply.c are suspicious (I didn't dig in enough to confirm that there is a bug, but we call the function once in

Re: [PATCH 00/20] object_id part 7

On Mon, Mar 20, 2017 at 08:14:20PM +0700, Duy Nguyen wrote: > On Sun, Mar 19, 2017 at 4:19 AM, brian m. carlson > wrote: > > This is part 7 in the continuing transition to use struct object_id. > > It feels very nice to see many ".hash" and "->hash" go away. Looking

[PATCH 3/6] prefix_filename: drop length parameter

This function takes the prefix as a ptr/len pair, but in every caller the length is exactly strlen(ptr). Let's simplify the interface and just take the string. This saves callers specifying it (and in some cases handling a NULL prefix). In a handful of cases we had the length already without

[PATCH 1/6] hash-object: fix buffer reuse with --path in a subdirectory

The hash-object command uses prefix_filename() without duplicating its return value. Since that function returns a static buffer, the value is overwritten by subsequent calls. This can cause incorrect results when we use --path along with hashing a file by its relative path, both of which need to

[PATCH 2/6] prefix_filename: move docstring to header file

This is a public function, so we should make its documentation available near the declaration. While we're at it, we can give a few details about how it works. Signed-off-by: Jeff King --- abspath.c | 5 - cache.h | 12 2 files changed, 12 insertions(+), 5

[PATCH 0/6] prefix_filename cleanups

I noticed a spot in builtin/bundle.c that would benefit from using prefix_filename(). But when I tried to use it, I noticed its interface was a little error-prone (because it returns a static buffer). And indeed, a little digging found a bug in hash-object related to this. So here's the fix for

[PATCH 3/5] t1400: use test_path_is_* helpers

Signed-off-by: Kyle Meyer --- t/t1400-update-ref.sh | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index be8b113b1..c5c8e95fc 100755 --- a/t/t1400-update-ref.sh +++

[PATCH 4/5] t1400: remove a set of unused output files

This test case redirects stdout and stderr to output files, but, unlike the other cases of redirection in the t1400 tests, these files are not examined downstream. Remove the redirection so that the output is visible when running the tests verbosely. Signed-off-by: Kyle Meyer

[PATCH 2/5] t1400: set core.logAllRefUpdates in "logged by touch" tests

A group of update-ref tests verifies that logs are created when either the log file for the ref already exists or core.logAllRefUpdates is "true". However, when the default for core.logAllRefUpdates was changed in 0bee59186 (Enable reflogs by default in any repository with a working directory.,

[PATCH 0/5] t1400: modernize style

These patches follow up on Peff's suggestion to modernize the style in t1400-update-ref.sh. 20170217082253.kxjezkxfqkfxj...@sigill.intra.peff.net The first two commits aren't concerned with "modernizing" the tests, but instead address issues that I noticed while looking more closely at

[PATCH 5/5] t1400: use test_when_finished for cleanup

Move cleanup lines that occur after test blocks into test_when_finished calls within the test bodies. Don't move cleanup lines that seem to be related to mutiple tests rather than a single test. Signed-off-by: Kyle Meyer --- t/t1400-update-ref.sh | 81

[PATCH 1/5] t1400: rename test descriptions to be unique

A few tests share their description with another test. Extend the descriptions to indicate how the tests differ. Signed-off-by: Kyle Meyer --- t/t1400-update-ref.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t1400-update-ref.sh

Re: [PATCH 19/20] Rename sha1_array to oid_array

On Mon, Mar 20, 2017 at 07:25:25PM +0700, Duy Nguyen wrote: > On Sun, Mar 19, 2017 at 4:19 AM, brian m. carlson > wrote: > > Since this structure handles an array of object IDs, rename it to struct > > oid_array. Also rename the accessor functions and the

[PATCH 0/3] git-describe deals gracefully with broken submodules

Our own version generation in GIT-VERSION-GEN is somewhat sane by testing if we have a .git dir, and use that as a signal whether the obtained copy of git was obtained using git (clone/fetch) or if it is just a downloaded tar ball. Other scripts to generate a version are not as cautious and just

[PATCH 2/3] revision machinery: gentle submodule errors

When a submodule is broken (e.g. its git directory is deleted or is not pointed to via the .git linking file), commands that deal with submodules error out reporting the submodule error. Sometimes users rather want to see the rest of the command succeed, ignoring the submodule that is severely

[PATCH 3/3] builtin/describe: introduce --submodule-error-as-dirty flag

git-describe tells you the version number you're at, or errors out, e.g. when you run it outside of a repository, which may happen when downloading a tar ball instead of using git to obtain the source code. To keep this property of only erroring out, when not in a repository, severe submodule

[PATCH 1/3] submodule.c: port is_submodule_modified to use porcelain 2

Migrate 'is_submodule_modified' to the new porcelain format of git-status. As the old porcelain only reported ' M' for submodules, no matter what happened inside the submodule (untracked files, changes to tracked files or move of HEAD), the new API properly reports the different scenarios. In a

Re: Safe to use stdatomic.h?

On Mon, Mar 20, 2017 at 04:18:20PM -0400, Ben Peart wrote: > My college Jeff is working on a patch series to further parallelize the > loading of the index. As part of that patch, it would be nice to use the > atomic_fetch_add function as that would be more efficient than creating a > mutex

Re: [PATCH 06/20] builtin/receive-pack: convert portions to struct object_id

On Mon, Mar 20, 2017 at 07:56:17PM +0700, Duy Nguyen wrote: > On Sun, Mar 19, 2017 at 4:19 AM, brian m. carlson > wrote: > > @@ -1489,23 +1489,24 @@ static struct command **queue_command(struct > > command **tail, > > const char

What's cooking in git.git (Mar 2017, #08; Mon, 20)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Git 2.12.1 has been tagged with

Hopefully

Dear friend, My name is Mr Micheal Rita, I am the Bill and Exchange (assistant) Manager of Bank of Africa Ouagadougou, Burkina Faso. In my department I discovered an abandoned sum of teen million five hundred thousand United State of American dollars (10.5MILLION USA DOLLARS) in an account that

Re: [PATCH 00/20] Separate `ref_cache` into a separate module

On 03/20/2017 11:32 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >> Michael Haggerty (20): >> get_ref_dir(): don't call read_loose_refs() for "refs/bisect" >> refs_read_raw_ref(): new function >> refs_ref_iterator_begin(): new function >>

Re: [PATCH 09/20] refs: split `ref_cache` code into separate files

Stefan Beller writes: > On Mon, Mar 20, 2017 at 12:47 PM, Junio C Hamano wrote: >> Jeff King writes: >> >>> It might have been a bit easier to review as separate steps for that >>> reason, but I doubt it's worth going back and re-doing.

Re: [PATCH 11/20] refs: record the ref_store in ref_cache, not ref_dir

On 03/20/2017 06:51 PM, Jeff King wrote: > On Mon, Mar 20, 2017 at 05:33:16PM +0100, Michael Haggerty wrote: > >> Instead of keeping a pointer to the ref_store in every ref_dir entry, >> store it once in `struct ref_cache`, and change `struct ref_dir` to >> include a pointer to its containing

Re: [PATCH v3 2/5] setup: allow for prefix to be passed to git commands

On 03/17, Junio C Hamano wrote: > Brandon Williams writes: > > > I don't think that prefix can ever have ".." in it. From what I > > understand it is always a path from the root of the repository to the > > cwd that the git command was invoked by. So in your example prefix >

Re: [PATCH 10/20] sha1_name: convert struct disambiguate_state to object_id

On Mon, Mar 20, 2017 at 08:07:09PM +0700, Duy Nguyen wrote: > On Sun, Mar 19, 2017 at 4:19 AM, brian m. carlson > wrote: > > @@ -332,7 +332,7 @@ static int init_object_disambiguation(const char *name, > > int len, > > ds->hex_pfx[i] = c; > >

Re: [PATCH 00/20] Separate `ref_cache` into a separate module

Michael Haggerty writes: > Michael Haggerty (20): > get_ref_dir(): don't call read_loose_refs() for "refs/bisect" > refs_read_raw_ref(): new function > refs_ref_iterator_begin(): new function > refs_verify_refname_available(): implement once for all backends >

Re: [PATCH 04/20] refs_verify_refname_available(): implement once for all backends

On 03/20/2017 06:42 PM, Jeff King wrote: > On Mon, Mar 20, 2017 at 05:33:09PM +0100, Michael Haggerty wrote: > >> It turns out that we can now implement >> `refs_verify_refname_available()` based on the other virtual >> functions, so there is no need for it to be defined at the backend >> level.

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

On Mon, Mar 20, 2017 at 11:11:17AM -0700, Stefan Beller wrote: > +cc Brian > > On Sun, Mar 19, 2017 at 2:33 PM, Alex Hoffman wrote: > > --- > > bisect.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/bisect.c b/bisect.c > > index

Re: [PATCH v3 2/2] l10n: Add git-add.txt to localized man pages

Jean-Noel Avila writes: > Signed-off-by: Jean-Noel Avila > --- > Documentation/po/documentation.fr.po | 1095 > ++ > Documentation/po/documentation.pot | 787 > 2 files changed, 1882 insertions(+)

Re: Add configuration options for some commonly used command-line options

On Mon, Mar 20, 2017 at 7:56 PM, Junio C Hamano wrote: > One thing we may want to consider is why we have to even worry about > scripts getting broken. It is because people script around > Porcelain, and that is because we have been too eager to improve > Porcelain while

Re: [ANNOUNCE] Git v2.12.1

Junio C Hamano writes: > The tarballs are NOT YET found at: > > https://www.kernel.org/pub/software/scm/git/ > > but hopefully will be in a few days (I am having trouble reaching > there). Now they are. Thanks.

A note from the maintainer

Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

[ANNOUNCE] Git v2.12.1

The latest maintenance release Git v2.12.1 is now available at the usual places. The tarballs are NOT YET found at: https://www.kernel.org/pub/software/scm/git/ but hopefully will be in a few days (I am having trouble reaching there). The following public repositories all have a copy of

Rework manpage localisation

The patch series has been reworked to remove the manpage localization task from the main documentation task. The Travis build should be back to normal, while still retaining the capability to generate localized man pages. Right now, there are some limitations with the version of po4a provided by

[PATCH v3 1/2] l10n: Introduce framework for localizing man pages

Providing git in localized version is a good step for general adoption of the tool. But as of now, if one needs to refer to the manual pages, they are still confronted to english. The aim is to provide documentation to users in their own language. The translation of the source asciidoc files is

[PATCH v3 2/2] l10n: Add git-add.txt to localized man pages

Signed-off-by: Jean-Noel Avila --- Documentation/po/documentation.fr.po | 1095 ++ Documentation/po/documentation.pot | 787 2 files changed, 1882 insertions(+) create mode 100644 Documentation/po/documentation.fr.po

Re: [PATCH 09/20] refs: split `ref_cache` code into separate files

On Mon, Mar 20, 2017 at 12:47 PM, Junio C Hamano wrote: > Jeff King writes: > >> It might have been a bit easier to review as separate steps for that >> reason, but I doubt it's worth going back and re-doing. I'll take your >> word that nothing substantive

Re: [PATCH v1] adding word_regex for go language

sourav mondal writes: > Subject: Re: [PATCH v1] adding word_regex for go language Perhaps clarify the title with what area this change affects, e.g. Subject: userdiff.c: patterns for "go" language cf. Documentation/SubmittingPatches. > Go programming

Re: Safe to use stdatomic.h?

On Mon, Mar 20, 2017 at 04:18:20PM -0400, Ben Peart wrote: > My college Jeff is working on a patch series to further parallelize the > loading of the index. As part of that patch, it would be nice to use the > atomic_fetch_add function as that would be more efficient than creating a > mutex

Safe to use stdatomic.h?

My college Jeff is working on a patch series to further parallelize the loading of the index. As part of that patch, it would be nice to use the atomic_fetch_add function as that would be more efficient than creating a mutex simply to protect a variable so that it can be incremented. I haven't

Re: [PATCH 2/2] revparse: introduce --is-inside-working-tree

Hi, Stefan Beller wrote: > This behaves the same as 'is-inside-worktree' and supersedes it. > See prior patch for discussion of "working tree" vs. "worktree" > > Signed-off-by: Stefan Beller > --- > Documentation/git-rev-parse.txt | 4 ++-- > builtin/rev-parse.c

Re: [PATCH 6/8] ref-filter: Add --no-contains option to tag/branch/for-each-ref

On Mon, Mar 20, 2017 at 8:52 PM, Jeff King wrote: > On Mon, Mar 20, 2017 at 10:32:47AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> > I think the more relevant comparison is "--no-merged", and it behaves >> > the same way as your new --no-contains. I don't think I saw this >> >

Re: [PATCH 09/20] refs: split `ref_cache` code into separate files

Jeff King writes: > It might have been a bit easier to review as separate steps for that > reason, but I doubt it's worth going back and re-doing. I'll take your > word that nothing substantive changed. In such a case when I do not want to "take your word", I often do "blame -C"

Re: [PATCH/RFC 1/3] stash: show less information for stash push --

Jeff King writes: > On Mon, Mar 20, 2017 at 10:51:16AM -0700, Junio C Hamano wrote: > >> > diff --git a/git-stash.sh b/git-stash.sh >> > index 9c70662cc8..59f055e27b 100755 >> > --- a/git-stash.sh >> > +++ b/git-stash.sh >> > @@ -299,10 +299,10 @@ push_stash () { >> >then >> >

Re: [PATCH 1/2] git.c: introduce --working-tree superseding --work-tree

Hi, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > Documentation/git.txt | 12 ++-- > git.c | 5 +++-- > 2 files changed, 9 insertions(+), 8 deletions(-) I think this is a step in the right direction. Thanks for writing it. Nits: -

Re: [PATCH 6/8] ref-filter: Add --no-contains option to tag/branch/for-each-ref

On Mon, Mar 20, 2017 at 10:32:47AM +0100, Ævar Arnfjörð Bjarmason wrote: > > I think the more relevant comparison is "--no-merged", and it behaves > > the same way as your new --no-contains. I don't think I saw this > > subtlety in the documentation, though. It might be worth mentioning > >

Re: Add configuration options for some commonly used command-line options

On Mon, Mar 20, 2017 at 11:56:35AM -0700, Junio C Hamano wrote: > One thing we may want to consider is why we have to even worry about > scripts getting broken. It is because people script around > Porcelain, and that is because we have been too eager to improve > Porcelain while neglecting

Re: [PATCH 0/2] use "working trees" instead of "worktree" in our API

Stefan Beller writes: >> For what it's worth, this conversation makes me think it was a mistake >> to call this construct a worktree. > > So the way forward is to purge the use of "worktree" meaning actual working > trees? GIT_WORK_TREE environment would have be a victim of

[PATCH v1] adding word_regex for go language

Go programming language is one of the promissing language now. Adding built-in driver for the same. This patch contains word_regex for go. As the language specification this has alpha-numeric and under-score for identifiers. It covers all types of number system decimal, octal, hexadecimal. Also

[PATCH 2/2] revparse: introduce --is-inside-working-tree

This behaves the same as 'is-inside-worktree' and supersedes it. See prior patch for discussion of "working tree" vs. "worktree" Signed-off-by: Stefan Beller --- Documentation/git-rev-parse.txt | 4 ++-- builtin/rev-parse.c | 3 ++- 2 files changed, 4

[PATCH 1/2] git.c: introduce --working-tree superseding --work-tree

Discussion on bf0231c661 (rev-parse: add --show-superproject-working-tree, 2017-03-08) pointed out we are inconsistent with the naming of "working tree" and "worktree" even in user facing commands and documentation[1]. Introduce the new --working-tree option, which is the same as --work-tree. As

[PATCH 0/2] use "working trees" instead of "worktree" in our API

> For what it's worth, this conversation makes me think it was a mistake > to call this construct a worktree. So the way forward is to purge the use of "worktree" meaning actual working trees? Thanks, Stefan Stefan Beller (2): git.c: introduce --working-tree superseding --work-tree

Re: [PATCH/RFC 3/3] stash: pass the pathspec argument to git reset

On Sun, Mar 19, 2017 at 08:23:51PM +, Thomas Gummerer wrote: > For "git stash -p --no-keep-index", the pathspec argument is currently > not passed to "git reset". This means that changed that are staged but > that are excluded from the pathspec still get unstaged by git stash -p. Yeah, I

Re: Add configuration options for some commonly used command-line options

Brandon Williams writes: > If in the future we did want better support for making user defaults > (apart from aliases) for commands we could entertain creating a command > like bash's 'command' which ignores any user defaults and executes a > particular command in a vanilla

Re: [PATCH/RFC 2/3] stash: make push -p -q --no-keep-index quiet

On Sun, Mar 19, 2017 at 08:23:50PM +, Thomas Gummerer wrote: > Currently when using "git stash push -p -q --no-keep-index", the -q flag > is not passed to the git reset which is executed when --no-keep-index is > also passed in. This means that git stash is somewhat verbose in this > mode

Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system

Junio C Hamano wrote: > Stefan Beller writes: >> While it may be true that you can have bare worktrees; I would question >> why anyone wants to do this, as the only thing it provides is an >> additional HEAD (plus its reflog). > > A more plausible situation is you start with

Re: [PATCH/RFC 1/3] stash: show less information for stash push --

On Mon, Mar 20, 2017 at 10:51:16AM -0700, Junio C Hamano wrote: > > diff --git a/git-stash.sh b/git-stash.sh > > index 9c70662cc8..59f055e27b 100755 > > --- a/git-stash.sh > > +++ b/git-stash.sh > > @@ -299,10 +299,10 @@ push_stash () { > > then > > if test $# != 0 > >

Re: [PATCH 09/20] refs: split `ref_cache` code into separate files

On Mon, Mar 20, 2017 at 05:33:14PM +0100, Michael Haggerty wrote: > The `ref_cache` code is currently too tightly coupled to > `files-backend`, making the code harder to understand and making it > awkward for new code to use `ref_cache` (as we indeed have planned). > Start loosening that coupling

Re: [PATCH/RFC 1/3] stash: show less information for stash push --

On Sun, Mar 19, 2017 at 08:23:49PM +, Thomas Gummerer wrote: > When using git stash push -- in the following sequence: > >git init -q repo >cd repo > >for i in one two; do >echo content >$i >git add $i >done >git

Re: [BUG] "git stash -- path" reports wrong unstaged changes

On Sat, Mar 18, 2017 at 06:36:58PM +, Thomas Gummerer wrote: > > + if test -z "$GIT_QUIET" && ! git diff-files --quiet > > + then > > + say "$(gettext "Unstaged changes after reset:")" > > + git diff-files

Re: [PATCH 00/20] Separate `ref_cache` into a separate module

On Mon, Mar 20, 2017 at 07:24:12PM +0100, Ævar Arnfjörð Bjarmason wrote: > On Mon, Mar 20, 2017 at 5:33 PM, Michael Haggerty > wrote: > > > I've completed a draft of an epic 48-patch series implementing all of > > the above points on my GitHub fork [1] as branch > >

Re: [PATCH 00/20] Separate `ref_cache` into a separate module

On Mon, Mar 20, 2017 at 5:33 PM, Michael Haggerty wrote: > I've completed a draft of an epic 48-patch series implementing all of > the above points on my GitHub fork [1] as branch > `wip/mmap-packed-refs`. It dramatically speeds up performance and > reduces memory usage for

Re: Add configuration options for some commonly used command-line options

On Mon, Mar 20, 2017 at 10:32:37AM -0700, Brandon Williams wrote: > > > IIRC the consensus was that such a facility would allow commands or > > > individual options to say "this command/option is configurable", thus > > > of course all plumbing utilities would be unconfigurable, but > > >

Phoenix Pet Expo - only 17 spaces left

The countdown is on! The Phoenix Pet Expo booths are going FAST – only TWENTY TWO are left. If you want to be represented, do not wait to call me. Here is what you need to know: -26,000 expected attendees -Friday & Saturday, April 14 & 15 -Happening at the West World of Scottsdale -Play,

Re: [PATCH 00/20] Separate `ref_cache` into a separate module

On Mon, Mar 20, 2017 at 05:33:05PM +0100, Michael Haggerty wrote: > I've completed a draft of an epic 48-patch series implementing all of > the above points on my GitHub fork [1] as branch > `wip/mmap-packed-refs`. It dramatically speeds up performance and > reduces memory usage for some tasks in

Re: [PATCH 18/20] commit_packed_refs(): use reference iteration

On Mon, Mar 20, 2017 at 05:33:23PM +0100, Michael Haggerty wrote: > -/* > - * An each_ref_entry_fn that writes the entry to a packed-refs file. > - */ > -static int write_packed_entry_fn(struct ref_entry *entry, void *cb_data) > -{ > - enum peel_status peel_status = peel_entry(entry, 0); > -

Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system

Stefan Beller writes: > While it may be true that you can have bare worktrees; I would question > why anyone wants to do this, as the only thing it provides is an > additional HEAD (plus its reflog). A more plausible situation is you start with a bare one as the primary and

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

+cc Brian On Sun, Mar 19, 2017 at 2:33 PM, Alex Hoffman wrote: > --- > bisect.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/bisect.c b/bisect.c > index 30808cadf..6feed8533 100644 > --- a/bisect.c > +++ b/bisect.c > @@ -131,7 +131,7 @@ static void

Re: [PATCH v2] push: Re-include "push.default=tracking" in the documentation

Ævar Arnfjörð Bjarmason writes: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index eccc012672..988659e16c 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -2459,6 +2459,8 @@ push.default:: >pushing to the same repository

Re: [PATCH/RFC 1/3] stash: show less information for stash push --

Thomas Gummerer writes: > When using git stash push -- in the following sequence: > >git init -q repo >cd repo > >for i in one two; do >echo content >$i >git add $i >done >git commit -qm base > >

Re: [PATCH 11/20] refs: record the ref_store in ref_cache, not ref_dir

On Mon, Mar 20, 2017 at 05:33:16PM +0100, Michael Haggerty wrote: > Instead of keeping a pointer to the ref_store in every ref_dir entry, > store it once in `struct ref_cache`, and change `struct ref_dir` to > include a pointer to its containing `ref_cache` instead. This makes it > easier to add

Re: Regression: Reword during rebase -i does not seem to trigger commit-msg hook anymore

On Mon, Mar 20, 2017 at 8:50 AM, Sebastian Schuberth wrote: > Hi, > > I'm using > > $ git --version > git version 2.12.0.windows.1 > > With this version, when I do a "reword" during an inteactive rebase session, > the commit-msg hook doe snot seem to be triggered anymore.

Re: [PATCH 04/20] refs_verify_refname_available(): implement once for all backends

On Mon, Mar 20, 2017 at 05:33:09PM +0100, Michael Haggerty wrote: > It turns out that we can now implement > `refs_verify_refname_available()` based on the other virtual > functions, so there is no need for it to be defined at the backend > level. Instead, define it once in `refs.c` and remove

Re: GSoC Project | Convert interactive rebase to C

On Mon, Mar 20, 2017 at 9:41 AM, Ivan Tham wrote: > Hi everyone, > > I am Ivan Tham. Currently studying in Computer Science in APIIT Malaysia. I am > interested particapate in Google Summer of Code 2017 under git organization. I > would like to attempt "Add more builtin

Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system

On Fri, Mar 17, 2017 at 6:36 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> -List details of each worktree. The main worktree is listed first, followed >> by >> -each of the linked worktrees. The output details include if the worktree is >>

Re: Add configuration options for some commonly used command-line options

On 03/20, Duy Nguyen wrote: > On Sun, Mar 19, 2017 at 8:43 PM, Ævar Arnfjörð Bjarmason > wrote: > > On Sun, Mar 19, 2017 at 2:18 PM, brian m. carlson > > wrote: > >> On Sun, Mar 19, 2017 at 11:15:33AM +0100, Matthieu Moy wrote: > >>> I think the

Re: [PATCH 00/20] Separate `ref_cache` into a separate module

Michael Haggerty writes: > * (And the main goal): Avoid reading and parsing the *whole > `packed-refs` file* (as we do now) every time any part of it is > needed. Instead, use binary search to find the reference and/or > range of references that we want, and parse the

Re: [PATCH] doc: change erroneous --[no]-whatever into --[no-]whatever

Thanks.

Re: [PATCH 3/8] tag: Change misleading --list documentation

Junio C Hamano writes: > Jeff King writes: > >> I think it's expected to work under the usual last-one-wins option >> parsing. A more subtle case is that: >> >> git tag -l -d foo >> >> would override "-l" with "-d". That's reasonable under the same rule as >>

Re: [PATCH v2 1/2] l10n: Introduce framework for localizing man pages

Jean-Noël Avila writes: > Asciidoc support was added in 0.45, and was included Ubuntu 14.04 but is > not present in ubuntu 12.04. The latest version is 0.48. > > So I guess you made your trials on 14.04. So, switching to 14.04 on > Travis would help, at least for this patch

GSoC Project | Convert interactive rebase to C

Hi everyone, I am Ivan Tham. Currently studying in Computer Science in APIIT Malaysia. I am interested particapate in Google Summer of Code 2017 under git organization. I would like to attempt "Add more builtin patterns for userdiff" particularly for shell for my microproject. I am interested to

[PATCH 06/20] Rename `add_ref()` to `add_ref_entry()`

This function's visibility is about to be increased, so give it a more distinctive name. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH 02/20] refs_read_raw_ref(): new function

Extract a new function from `refs_resolve_ref_unsafe()`. It will be useful elsewhere. Signed-off-by: Michael Haggerty --- refs.c | 11 +-- refs/refs-internal.h | 4 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c

[PATCH 04/20] refs_verify_refname_available(): implement once for all backends

It turns out that we can now implement `refs_verify_refname_available()` based on the other virtual functions, so there is no need for it to be defined at the backend level. Instead, define it once in `refs.c` and remove the `files_backend` definition. Signed-off-by: Michael Haggerty

  1   2   >