Re: [PATCH/RFC] WIP: log: allow "-" as a short-hand for "previous branch"

Siddharth Kannan writes: > Making a change in sha1_name.c will touch a lot of commands > (setup_revisions is called from everywhere in the codebase), so, I am > still trying to figure out how to do this such that the rest of the > codepath remains unchanged.

Re: GSoC 2017: application open, deadline = February 9, 2017

Jeff King writes: > On Mon, Jan 23, 2017 at 04:02:02PM +0100, Matthieu Moy wrote: > >> * We need to write the application, i.e. essentially polish and update >> the text here: https://git.github.io/SoC-2016-Org-Application/ and >> update the list of project ideas and

Re: [PATCH 1/5] add SWAP macro

Hi Junio & René, On Tue, 7 Feb 2017, Junio C Hamano wrote: > René Scharfe writes: > > > Swapping between different types would then still have to be done > > manually, but I wonder how common that is -- couldn't find such a case > > in our tree. > > I do not think it is a common

Re: GSoC 2017: application open, deadline = February 9, 2017

On Wed, Feb 08, 2017 at 03:54:25PM +0100, Matthieu Moy wrote: > >> * We need to write the application, i.e. essentially polish and update > >> the text here: https://git.github.io/SoC-2016-Org-Application/ and > >> update the list of project ideas and microprojects : > >>

Re: init --separate-git-dir does not set core.worktree

> [*] https://github.com/magit/magit/issues/460#issuecomment-36035787. I would agree with the thinking in that issue.

Копия: Sеx & Daтіng: Тесhnology and тhе fеаr of rejесtіоn

Это копия сообщения, которое вы отправили ООО "УТЭП-Московский" через УТЭП-Московский Это письмо отправлено с сайта http://danfoss-utep.ru/ от: LolaMagboidoda Оftеntiмеs, тhе sаyіng, “thеrе аrе рlеnty оf fish іn тhе sea,” іs gіvеn аs а соnsolatіоn аfтer a breакuр or аs

Re: init --separate-git-dir does not set core.worktree

On Fri, Feb 3, 2017 at 5:38 AM, Duy Nguyen wrote: > On Thu, Feb 2, 2017 at 7:37 PM, Kyle Meyer wrote: >> Duy Nguyen writes: >> >>> On Thu, Feb 2, 2017 at 10:55 AM, Kyle Meyer wrote: As of 6311cfaf9 (init: do not

Re: [PATCH] difftool: fix bug when printing usage

Hi Junio, On Tue, 7 Feb 2017, Junio C Hamano wrote: > Junio C Hamano writes: > > > Johannes Schindelin writes: > > > >>> > Likewise, this would become > >>> > > >>> > GIT_CEILING_DIRECTORIES="$PWD/not" \ > >>> > test_expect_code

Dear God's Select,

Dear God's Select, I am writing this mail to you with heavy tears In my eyes and great sorrow in my heart, My Name is Mrs.Louisa Besson, and I am contacting you from my countryTunisia I want to tell you this because I don't have any other option than totell you as I was touched to open up to you,

Re: Fwd: Possibly nicer pathspec syntax?

Duy Nguyen writes: > On Wed, Feb 8, 2017 at 12:12 PM, Linus Torvalds > wrote: >> Two-patch series to follow. > > glossary-content.txt update for both patches would be nice. I am no longer worried about it as I saw somebody actually sent

Re: "disabling bitmap writing, as some objects are not being packed"?

Duy Nguyen writes: > On second thought, perhaps gc.autoDetach should default to false if > there's no tty, since its main point it to stop breaking interactive > usage. That would make the server side happy (no tty there). Sounds like an idea, but wouldn't that keep the

Re: [PATCH] push options: fail properly in the stateless case

Stefan Beller writes: > When using non-builtin protocols relying on a transport helper > (such as http), push options are not propagated to the helper. > > Fix this by propagating the push options to the transport helper and The description up to this point is VERY readable

Re: Trying to use xfuncname without success.

Thanks Rene, but you seem to have missed the point. NOTHING is working. No matter what I put there, it doesn't seem to get matched. Just to be sure, I tested your regex and again it didn't work. Someone on the SO site stated they could get it to work on FreeBSD and I'm on Windows, so this

Re: [PATCH RFC 0/2] Kill manual ref parsing code in worktree.c

Nguyễn Thái Ngọc Duy writes: > A hundred years ago I added this code because a "standalone" ref > parsing code was not available from refs.c and the file was going through > some heavy changes that refactoring its ref parsing code out was not > an option. I promised to kill

Software Freedom Conservancy donations

The recent thread about the git-scm.com website raised some discussion about money, and a lot of people offered financial assistance. As I said in that thread, we _don't_ have a dire need for money to keep hosting the site. But we do sometimes need money for other things (like conference travel),

Re: Trying to use xfuncname without success.

Am 08.02.2017 um 18:11 schrieb Jack Adrian Zappa: > Thanks Rene, but you seem to have missed the point. NOTHING is > working. No matter what I put there, it doesn't seem to get matched. I'm not so sure about that. With your example I get this diff without setting diff.natvis.xfuncname: diff

Re: [PATCH] rev-parse --git-path: fix output when running in a subdirectory

Johannes Schindelin writes: > The problem lies deeper, much deeper... > ... but it bought us many, many problems. I think you are making a mountain out of molehill here. This looks like as an opposite problem of a bug that forgets to prepend the prefix to relative

Re: Trying to use xfuncname without success.

I just put this togther: https://github.com/sxlijin/xfuncname-test Try cloning and then for any of config1 thru 3, $ cp configX .git/config $ git diff HEAD^ -- test.natvis On Wed, Feb 8, 2017 at 2:42 PM, Jack Adrian Zappa wrote: > Thanks Samuel, > > So, the question is,

Re: [PATCH] push options: fail properly in the stateless case

On Wed, Feb 8, 2017 at 10:11 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> When using non-builtin protocols relying on a transport helper >> (such as http), push options are not propagated to the helper. >> >> Fix this by propagating the push

Re: "disabling bitmap writing, as some objects are not being packed"?

On Wed, Feb 08, 2017 at 02:05:42PM -0500, David Turner wrote: > On Wed, 2017-02-08 at 09:44 -0800, Junio C Hamano wrote: > > Duy Nguyen writes: > > > > > On second thought, perhaps gc.autoDetach should default to false if > > > there's no tty, since its main point it to stop

[PATCH] diff: print line prefix for --name-only output

On Wed, Feb 08, 2017 at 01:24:34PM +0700, Duy Nguyen wrote: > On Wed, Feb 8, 2017 at 6:11 AM, Davide Del Vento wrote: > > `git log --graph --name-only` works fine, but the name is not > > properly indented as it is for `git log --graph --name-status` > > > > I tested this in

Re: Trying to use xfuncname without success.

> I'm not so sure about that. With your example I get this diff without setting diff.natvis.xfuncname: So, to make sure we are on the same page, I removed the diff.natvis.xfuncname from the .gitconfig and .git/config. My output was: C:\Users\adrianh\Documents\tmp>git diff diff --git

Re: Trying to use xfuncname without success.

Thanks Samuel, So, the question is, what is causing this problem on my system? Anyone have an idea to help diagnose this problem? On Wed, Feb 8, 2017 at 3:24 PM, Samuel Lijin wrote: > On Windows 7, it works for me in both CMD and Git Bash: > > $ git --version > git version

Re: gitconfig get out of sync with submodule entries on branch switch

On Mon, Feb 6, 2017 at 4:17 AM, Benjamin Schindler wrote: > > > On 06.02.2017 11:35, Stefan Beller wrote: >> >> Answering the original email, as I feel we're going down the wrong rabbit >> hole in the existing thread. >> >> On Mon, Jan 30, 2017 at 8:21 AM, Benjamin

Re: Trying to use xfuncname without success.

On Windows 7, it works for me in both CMD and Git Bash: $ git --version git version 2.11.0.windows.3 $ git diff HEAD^ --word-diff diff --git a/test.natvis b/test.natvis index 93396ad..1233b8c 100644 --- a/test.natvis +++ b/test.natvis @@ -18,6 +18,7 @@ test {+added_var+}

Re: [RFC] mailmap.blob overrides default .mailmap

On Tue, Feb 07, 2017 at 11:45:31PM +0100, Cornelius Weig wrote: > On the other hand, a checked-in .mailmap file and a mailmap-blob are > both as in-history as the other to me. Now consider the following > settings: I think it depends how you use them. You could point mailmap.blob to some other

Re: [PATCH 2/2] worktree.c: use submodule interface to access refs from another worktree

On Wed, Feb 8, 2017 at 3:31 AM, Nguyễn Thái Ngọc Duy wrote: > (**) At this point, we may want to rename refs *_submodule API to > something more neutral, maybe s/_submodule/_remote/ I agree on (**), except that I am not sure if /_remote/ is a better name, because there is

[PATCH v2 02/11] for_each_alternate_ref: stop trimming trailing slashes

The real_pathdup() function will have removed extra slashes for us already (on top of the normalize_path() done when we created the alternate_object_database struct in the first place). Incidentally, this also fixes the case where the path is just "/", which would read off the start of the array.

[PATCH v2 0/11] reducing resource usage of for_each_alternate_ref

This is a minor re-roll of the patches from: http://public-inbox.org/git/20170124003729.j4ygjcgypdq7h...@sigill.intra.peff.net/ (which got some review, but I don't think was picked up for even 'pu'). I won't repeat the numbers and background from that message, but the gist of it is that this

Re: [PATCH] dir: avoid allocation in fill_directory()

On 02/08, Duy Nguyen wrote: > On Wed, Feb 8, 2017 at 5:04 AM, René Scharfe wrote: > > Pass the match member of the first pathspec item directly to > > read_directory() instead of using common_prefix() to duplicate it first, > > thus avoiding memory duplication, strlen(3) and

[PATCH v2 03/11] for_each_alternate_ref: use strbuf for path allocation

We have a string with ".../objects" pointing to the alternate object store, and overwrite bits of it to look at other paths in the (potential) git repository holding it. This works because the only path we care about is "refs", which is shorter than "objects". Using a strbuf to hold the path lets

[PATCH v2 04/11] for_each_alternate_ref: pass name/oid instead of ref struct

Breaking down the fields in the interface makes it easier to change the backend of for_each_alternate_ref to something that doesn't use "struct ref" internally. The only field that callers actually look at is the oid, anyway. The refname is kept in the interface as a plausible thing for future

[PATCH v2 01/11] for_each_alternate_ref: handle failure from real_pathdup()

In older versions of git, if real_path() failed to resolve the alternate object store path, we would die() with an error. However, since 4ac9006f8 (real_path: have callers use real_pathdup and strbuf_realpath, 2016-12-12) we use the real_pathdup() function, which may return NULL. Since we don't

Re: [PATCH v4] tag: generate useful reflog message

cornelius.w...@tngtech.com writes: > From: Cornelius Weig > > When tags are created with `--create-reflog` or with the option > `core.logAllRefUpdates` set to 'always', a reflog is created for them. > So far, the description of reflog entries for tags was empty,

Re: Bug with fixup and autosquash

Ashutosh Bapat writes: > I have been using git rebase heavily these days and seem to have found a bug. > > If there are two commit messages which have same prefix e.g. > yy This is prefix > xx This is prefix and message > > xx comitted before yy >

Re: Fwd: Possibly nicer pathspec syntax?

Junio C Hamano writes: > If you know offhand which callers pass neither of the two > PATHSPEC_PREFER_* bits and remember for what purpose you allowed > them to do so, please remind me. I'll keep digging in the meantime. Answering my own questions, here are my findings so far

Re: Trying to use xfuncname without success.

Thanks Samuel, That example showed that there must be something wrong in my .git directory, because with it, I'm getting the correct output. Moving the same lines to my .git/config didn't work. On Wed, Feb 8, 2017 at 3:46 PM, Samuel Lijin wrote: > I just put this togther:

[PATCH v2 06/11] fetch-pack: cache results of for_each_alternate_ref

We may run for_each_alternate_ref() twice, once in find_common() and once in everything_local(). This operation can be expensive, because it involves running a sub-process which must freshly load all of the alternate's refs from disk. Let's cache and reuse the results between the two calls. We

[PATCH v2 07/11] add oidset API

This is similar to many of our uses of sha1-array, but it overcomes one limitation of a sha1-array: when you are de-duplicating a large input with relatively few unique entries, sha1-array uses 20 bytes per non-unique entry. Whereas this set will use memory linear in the number of unique entries

[PATCH v2 08/11] receive-pack: use oidset to de-duplicate .have lines

If you have an alternate object store with a very large number of refs, the peak memory usage of the sha1_array can grow high, even if most of them are duplicates that end up not being printed at all. The similar for_each_alternate_ref() code-paths in fetch-pack solve this by using flags in

[PATCH v2 10/11] receive-pack: treat namespace .have lines like alternates

Namely, de-duplicate them. We use the same set as the alternates, since we call them both ".have" (i.e., there is no value in showing one versus the other). Signed-off-by: Jeff King --- builtin/receive-pack.c | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff

[PATCH v2 11/11] receive-pack: avoid duplicates between our refs and alternates

We de-duplicate ".have" refs among themselves, but never check if they are duplicates of our local refs. It's not unreasonable that they would be if we are a "--shared" or "--reference" clone of a similar repository; we'd have all the same tags. We can handle this by inserting our local refs into

Re: [PATCH v2] Document the --no-gui option in difftool

Denton Liu writes: > Prior to this, the `--no-gui` option was not documented in the manpage. > This commit introduces this into the manpage > > Signed-off-by: Denton Liu > --- Looks good, thanks. > Documentation/git-difftool.txt | 5 +++-- > 1 file

[PATCHv2] push options: pass push options to the transport helper

When using non-builtin protocols relying on a transport helper (such as http), push options are not propagated to the helper. The user could ask for push options and a push would seemingly succeed, but the push options would never be transported to the server, misleading the users expectation.

Re: [PATCH 2/2] pathspec: don't error out on all-exclusionary pathspec patterns

Linus Torvalds writes: > @@ -546,10 +546,16 @@ void parse_pathspec(struct pathspec *pathspec, > pathspec->magic |= item[i].magic; > } > > - if (nr_exclude == n) > - die(_("There is nothing to exclude from by :(exclude) >

Re: [PATCH] refs-internal.c: make files_log_ref_write() static

Nguyễn Thái Ngọc Duy writes: > Created in 5f3c3a4e6f (files_log_ref_write: new function - 2015-11-10) > but probably never used outside refs-internal.c > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- It's been more than a year, so let's declare that when

Automatically Add .gitignore Files

I frequently forget to add .gitignore files when creating new .gitignore files. I'd like to request a command-line option to always add .gitignore files (or, more generally, always add files that match a given file specification). Replicate 0. git init ... 1. echo "*.bak" >> .gitignore 2. touch

Re: "disabling bitmap writing, as some objects are not being packed"?

On Wed, 2017-02-08 at 14:08 -0500, Jeff King wrote: > On Wed, Feb 08, 2017 at 02:05:42PM -0500, David Turner wrote: > > > On Wed, 2017-02-08 at 09:44 -0800, Junio C Hamano wrote: > > > Duy Nguyen writes: > > > > > > > On second thought, perhaps gc.autoDetach should default to

Re: [PATCH 2/2] pathspec: don't error out on all-exclusionary pathspec patterns

On Wed, Feb 8, 2017 at 1:59 PM, Junio C Hamano wrote: > > Thanks. Even though the current code does not refer to the original > prefixlen after the added hunk, I'd prefer not to destroy it to > avoid future troubles, so I'll queue with a bit of tweak there, > perhaps like the

Re: [PATCH v4] tag: generate useful reflog message

On 02/08/2017 10:28 PM, Junio C Hamano wrote: > cornelius.w...@tngtech.com writes: > >> From: Cornelius Weig >> >> When tags are created with `--create-reflog` or with the option >> `core.logAllRefUpdates` set to 'always', a reflog is created for them. >> So far,

Re: [PATCH 1/2] pathspec magic: add '^' as alias for '!'

On 02/07, Linus Torvalds wrote: > > From: Linus Torvalds > Date: Tue, 7 Feb 2017 21:05:28 -0800 > Subject: [PATCH 1/2] pathspec magic: add '^' as alias for '!' > > The choice of '!' for a negative pathspec ends up not only not matching > what we do for revisions,

[PATCH v2 05/11] for_each_alternate_ref: replace transport code with for-each-ref

The current method for getting the refs from an alternate is to run upload-pack in the alternate and parse its output using the normal transport code. This works and is reasonably short, but it has a very bad memory footprint when there are a lot of refs in the alternate. There are two problems:

[PATCH v2 09/11] receive-pack: fix misleading namespace/.have comment

The comment claims that we handle alternate ".have" lines through this function, but that hasn't been the case since 85f251045 (write_head_info(): handle "extra refs" locally, 2012-01-06). Signed-off-by: Jeff King --- builtin/receive-pack.c | 5 + 1 file changed, 1

Re: Trying to use xfuncname without success.

That was it. I have a .gitattributes file in my home directory. Ahhh, but it's not in my %userprofile% directory, but in my ~ directory. A bit confusing having 2 home directories. I made a link to my .gitconfig, but forgot to make a link to my .gitattributes. Thanks. A On Wed, Feb 8, 2017

Re: Automatically Add .gitignore Files

Thangalin writes: > I frequently forget to add .gitignore files when creating new .gitignore > files. > > I'd like to request a command-line option to always add .gitignore > files (or, more generally, always add files that match a given file > specification). That is

Re: Trying to use xfuncname without success.

> where it has grabbed a line at 126 and is using that for the hunk header. When I say that, I mean that it is using that line for *every* hunk header, for every change, regardless if it has passed a hunk head that it should have matched. On Wed, Feb 8, 2017 at 7:01 PM, Jack Adrian Zappa

Re: "disabling bitmap writing, as some objects are not being packed"?

On Wed, Feb 08, 2017 at 04:18:25PM -0800, Junio C Hamano wrote: > > We wrote something similar at GitHub, too, but we never ended up using > > it in production. We found that with a sane scheduler, it's not too big > > a deal to just do maintenance once in a while. > > Thanks again for this.

Re: [PATCH 1/2] pathspec magic: add '^' as alias for '!'

Brandon Williams writes: > git cmd -- :^dir > > would produce some output which says: > ':^dir': pathspec magic not supported by this command: 'exclude' (mnemonic: > '!') > > And the user may scratch their head for a second since they didn't > supply the '!' character, but

Re: [PATCH 2/2] worktree.c: use submodule interface to access refs from another worktree

Nguyễn Thái Ngọc Duy writes: > As such, we can just linked worktree's path as a submodule. We just need Lack of verb made me read this three times. "We can just treat linked worktree's path as if it were a submodule"? I agree with you that the "submodule" in the name is

[PATCH v5] tag: generate useful reflog message

From: Cornelius Weig When tags are created with `--create-reflog` or with the option `core.logAllRefUpdates` set to 'always', a reflog is created for them. So far, the description of reflog entries for tags was empty, making the reflog hard to understand. For example:

Re: Trying to use xfuncname without success.

Tried to copy the .git/config file over to the non-working repository and it didn't seem to do anything. Could the git database be partially corrupted? On Wed, Feb 8, 2017 at 7:00 PM, Jack Adrian Zappa wrote: > Well, it mostly works, but I'm getting some weirdness where

Re: Automatically Add .gitignore Files

> I am tempted to say that there should be a way to somehow forbid use > of the "-m" option to "git commit" by default, until the user gains > more familiarity with use of Git. Since I am using git, I am tempted to say that "git commit -m" should be abolished. If I tell somebody how to use git, I

Re: What's cooking in git.git (Feb 2017, #02; Mon, 6)

> * sb/submodule-doc (2017-01-12) 3 commits > - submodules: add a background story > - submodule update documentation: don't repeat ourselves > - submodule documentation: add options to the subcommand > > Needs review. > The first two commits are good to go IIRC as you seemed to be positive

Re: What's cooking in git.git (Feb 2017, #02; Mon, 6)

Stefan Beller writes: >> * sb/submodule-doc (2017-01-12) 3 commits >> - submodules: add a background story >> - submodule update documentation: don't repeat ourselves >> - submodule documentation: add options to the subcommand > > The first two commits are good to go IIRC

Re: Trying to use xfuncname without success.

Well, it mostly works, but I'm getting some weirdness where it has grabbed a line at 126 and is using that for the hunk header. Strange thing is, I move the file to another repository, commit it, make a change to the fileand do a diff, and it gets the correct hunk header. I'm at a loss. :( On

Re: [PATCH v4] tag: generate useful reflog message

Cornelius Weig writes: > A version with revised tests will follow. Thanks; I think this is clean enough. Let's queue this one and advance it to 'next' soonish.

Re: [PATCH/RFC] WIP: log: allow "-" as a short-hand for "previous branch"

Hello Matthieu, On 8 February 2017 at 20:10, Matthieu Moy wrote: > In a previous discussion, I made an analogy with "cd -" (which is the > source of inspiration of this shorthand AFAIK): "-" did not magically > become "the last visited directory" for all Unix

Re: "disabling bitmap writing, as some objects are not being packed"?

On Wed, Feb 08, 2017 at 05:14:03PM -0500, David Turner wrote: > > I wonder if you'd want to either bump the auto-gc object limit, or > > possibly reduce the gc.pruneExpire limit to keep this situation from > > coming up in the first place (or at least mitigating the amount of time > > it's the

Re: [PATCH v2] rev-list-options.txt: update --all about HEAD

On Wed, Feb 08, 2017 at 01:06:41PM +0700, Nguyễn Thái Ngọc Duy wrote: > This is the document patch for f0298cf1c6 (revision walker: include a > detached HEAD in --all - 2009-01-16). > > Even though that commit is about detached HEAD, as Jeff pointed out, > always adding HEAD in that case may

Re: [PATCH] push options: fail properly in the stateless case

Stefan Beller writes: >>> +'option push-option :: >>> + Transmit this push option. >>> + >> >> There is no "c-string" in the current documentation used or >> defined. The closest thing I found is >> >> ... that field will be quoted in the manner of a C string ... >>

Re: [PATCH 2/2] worktree.c: use submodule interface to access refs from another worktree

Stefan Beller writes: > On Wed, Feb 8, 2017 at 3:31 AM, Nguyễn Thái Ngọc Duy > wrote: >> (**) At this point, we may want to rename refs *_submodule API to >> something more neutral, maybe s/_submodule/_remote/ > > I agree on (**), except that I am not

Re: "disabling bitmap writing, as some objects are not being packed"?

Jeff King writes: > In my experience, auto-gc has never been a low-maintenance operation on > the server side (and I do think it was primarily designed with clients > in mind). I do not think auto-gc was ever tweaked to help server usage, in its history since it was invented

Re: [PATCH 1/2] pathspec magic: add '^' as alias for '!'

On Wed, Feb 8, 2017 at 3:05 PM, Junio C Hamano wrote: > - it hints that '!' is the more official spelling, making the >output you showed above acceptable. Long term , I'd rather have ^ as the "official" spelling as that is easier to teach to people. ! being a historic

Re: [RFC 00/14] Allow fetch-pack to send ref names (globs allowed)

Jonathan Tan writes: > Usages of the list of remote refs or the remote-local ref > map are updated as follows: > - check_not_current_branch (which checks that the current branch is not >affected by the fetch) is performed both on the original ref map (to >die

[PATCH] gc: ignore old gc.log files

The intent of automatic gc is to have a git repository be relatively low-maintenance from a server-operator perspective. Of course, large operators like GitHub will need a more complicated management strategy, but for ordinary usage, git should just work. In this commit, git learns to ignore

Re: git-scm.com status report

On Mon, Feb 06, 2017 at 07:27:54PM +0100, Jeff King wrote: > - It's mostly silly for this to be a Rails app at all. It's a static > site which occasionally sucks in and formats new content (like the > latest git version, new manpages, etc). The intent here was to make > something

[PATCH] Documentation: unify bottom "part of git suite" lines

We currently have 168 man pages that mention they are part of Git, you can check yourself easily via: $ git grep "Part of the linkgit:git\[1\] suite" |wc -l 168 However some have a trailing period, i.e. $ git grep "Part of the linkgit:git\[1\] suite." |wc -l 8 Unify the bottom line in all

Re: git-scm.com status report

On Thu, Feb 09, 2017 at 02:12:09AM +, brian m. carlson wrote: > My only concern with using GitHub Pages is that I don't believe it > currently supports TLS on custom domains. Since we currently have TLS > enabled, along with HTTP Strict Transport Security (as we should), such > a

Re: [PATCH] gc: ignore old gc.log files

On Wed, Feb 08, 2017 at 09:02:22PM -0500, David Turner wrote: > The intent of automatic gc is to have a git repository be relatively > low-maintenance from a server-operator perspective. Of course, large > operators like GitHub will need a more complicated management strategy, > but for ordinary

Re: What's cooking in git.git (Feb 2017, #02; Mon, 6)

On Mon, Feb 06, 2017 at 02:34:08PM -0800, Junio C Hamano wrote: > * sk/parse-remote-cleanup (2017-02-06) 1 commit > (merged to 'next' on 2017-02-06 at 6ec89f72d5) > + parse-remote: remove reference to unused op_prep > > Code clean-up. > > Will merge to 'master'. Hrm. Are the functions in

Re: git-scm.com status report

Jeff King wrote: > I agree we should continue to serve HTTPS. The usual solution for our > use case is to stick a CDN like Cloudflare in front of GitHub Pages (and > I think we'd want to do that anyway for performance). > > I haven't done it, but there are various guides. Here's

Re: Bug with fixup and autosquash

On Thu, Feb 9, 2017 at 4:25 AM, Junio C Hamano wrote: > Ashutosh Bapat writes: > >> I have been using git rebase heavily these days and seem to have found a bug. >> >> If there are two commit messages which have same prefix e.g. >> yy This

Re: [PATCH] gc: ignore old gc.log files

David Turner wrote: > + echo fleem> .git/gc.log && A minor nit: echo fleem >.git/gc.log && Otherwise, it's good to know there's attention paid to this issue. I've been ignoring cron mails from my mirrors for too long :x Thanks.

Re: What's cooking in git.git (Feb 2017, #02; Mon, 6)

Jeff King writes: > On Mon, Feb 06, 2017 at 02:34:08PM -0800, Junio C Hamano wrote: > >> * sk/parse-remote-cleanup (2017-02-06) 1 commit >> (merged to 'next' on 2017-02-06 at 6ec89f72d5) >> + parse-remote: remove reference to unused op_prep >> >> Code clean-up. >> >> Will

Re: [PATCH v2 2/2] grep: use '/' delimiter for paths

Jeff King writes: > master:a:a:a:a:a:a:a:a:a:a:a > > I think there are 2^(n-1) possible paths (each colon can be a real colon > or a slash). Though I guess if you walk the trees as you go, you only > have to examine at most "n" paths to find the first-level tree, and then > at

Re: [PATCH v2 2/2] grep: use '/' delimiter for paths

On Tue, Feb 07, 2017 at 12:24:30PM -0800, Junio C Hamano wrote: > Having said that, I actually think "make it more convenient" without > making anything incorrect would be to teach the revision parser to > understand > > > as an extended SHA-1

[RFC-PATCHv2] submodules: add a background story

Just like gitmodules(5), gitattributes(5), gitcredentials(7), gitnamespaces(7), gittutorial(7), we'd like to provide some background on submodules, which is not specific to the `submodule` command, but elaborates on the background and its intended usage. Add gitsubmodules(7), that explains the

Re: [PATCH v2 2/2] grep: use '/' delimiter for paths

On Wed, Feb 08, 2017 at 09:14:17PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > master:a:a:a:a:a:a:a:a:a:a:a > > > > I think there are 2^(n-1) possible paths (each colon can be a real colon > > or a slash). Though I guess if you walk the trees as you go, you only > >

Re: [PATCH 1/2] refs.c: add resolve_ref_submodule()

On 02/08/2017 12:31 PM, Nguyễn Thái Ngọc Duy wrote: > This is basically the extended version of resolve_gitlink_ref() where we > have access to more info from the underlying resolve_ref_recursively() call. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > refs.c | 20

Re: [PATCH 2/2] worktree.c: use submodule interface to access refs from another worktree

On 02/08/2017 12:31 PM, Nguyễn Thái Ngọc Duy wrote: > The patch itself is relatively simple: manual parsing code is replaced > with a call to resolve_ref_submodule(). The manual parsing code must die > because only refs/files-backend.c should do that. Why submodule here is > a more interesting

Re: "disabling bitmap writing, as some objects are not being packed"?

On Wed, 2017-02-08 at 13:45 +0700, Duy Nguyen wrote: > On Wed, Feb 8, 2017 at 8:03 AM, David Turner wrote: > > On Sat, 2016-12-17 at 14:50 +0700, Duy Nguyen wrote: > >> And we can't grep for fatal errors anyway. The problem that led to > >> 329e6e8794 was this line > >> > >>

Re: "disabling bitmap writing, as some objects are not being packed"?

On Wed, Feb 8, 2017 at 3:24 PM, David Turner wrote: > On Wed, 2017-02-08 at 13:45 +0700, Duy Nguyen wrote: >> On Wed, Feb 8, 2017 at 8:03 AM, David Turner wrote: >> > On Sat, 2016-12-17 at 14:50 +0700, Duy Nguyen wrote: >> >> And we can't grep for fatal

[PATCH] refs-internal.c: make files_log_ref_write() static

Created in 5f3c3a4e6f (files_log_ref_write: new function - 2015-11-10) but probably never used outside refs-internal.c Signed-off-by: Nguyễn Thái Ngọc Duy --- refs/files-backend.c | 3 +++ refs/refs-internal.h | 4 2 files changed, 3 insertions(+), 4 deletions(-) diff

Bug with fixup and autosquash

Hi Git-developers, First of all thanks for developing this wonderful scm tool. It's sooo versatile. I have been using git rebase heavily these days and seem to have found a bug. If there are two commit messages which have same prefix e.g. yy This is prefix xx This is prefix and message

Re: Non-zero exit code without error

Hi, On Tue, Feb 7, 2017 at 12:27 PM, Serdar Sahin wrote: > Hi, > > When we execute the following lines, the exit code is 1, but it is > unclear what is the reason of this exit code. Do you have any idea? > > git clone --mirror --depth 50 --no-single-branch >

Re: subtree merging fails

@Samuel Lijin I tried now and I get: "merge: branch_name
- not something we can merge". Maybe that is something easy to fix but currently I am using a workaround script so I am not putting any more effort at this at the moment. @David Aguilar That's true but the trailing slash is already there.

Re: Non-zero exit code without error

Hi Christian, We are using a private repo (Github Enterprise). Let me give you the details you requested. On Git Server: git version 2.6.5.1574.g5e6a493 On my client: git version 2.10.1 (Apple Git-78) I’ve tried to reproduce it with public repos, but couldn’t do so. If I could get an

[PATCH 1/2] refs.c: add resolve_ref_submodule()

This is basically the extended version of resolve_gitlink_ref() where we have access to more info from the underlying resolve_ref_recursively() call. Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 20 ++-- refs.h | 3 +++ 2 files changed, 17 insertions(+),

[PATCH 2/2] worktree: demonstrate a half-working workaround for auto-gc

While worktrees are marked "experimental", there is really no alternative to using them when trying to work on multiple patch series in parallel. Sadly, there is still a bug that causes irretrievable data loss caused by worktree's incomplete handling of reflogs (and of the multiple indices of the

[PATCH 1/2] worktree: demonstrate data lost to auto-gc

When gc --auto is called in the presence of worktrees, it fails to take *all* reflogs into account when trying to retain reachable objects, and as a consequence data integrity goes pretty much to hell. This patch provides a test case in the hopes that this bug gets fixed, after an initial attempt

  1   2   >