Re: [PATCH 0/3] Close commit-graph before calling 'gc'

2019-05-18 Thread Junio C Hamano
"Derrick Stolee via GitGitGadget" writes: > This series adds close_commit_graph() to close_all_packs() and then renames > close_all_packs() to close_object_store(). This name is more descriptive of > its larger purpose. OK. Somebody needs to go though all the existing callers of close_all_pack

Re: [PATCH] make slash-rules more readable

2019-05-18 Thread Junio C Hamano
"Dr. Adam Nielsen" writes: > gitignore.txt: make slash-rules more readable > > Make all paragraphs valid, even if they are not read > in strict order. I think you are giving up on this, and I do not think that is particularly a bad thing ;-) > + - A slash `/` is used as a directory separator. A

Re: js/difftool-no-index, was Re: What's cooking in git.git (May 2019, #02; Tue, 14)

2019-05-18 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Wed, 15 May 2019, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> I was imagining what would happen if we treat _everything_ in the two >> directories being compared by "difftool --dir-diff --no-index" as if it >> is tracked. > > Isn't

Re: [PATCH v2] rebase -r: always reword merge -c

2019-05-18 Thread Junio C Hamano
Johannes Schindelin writes: > I think this one fell through the cracks (at least I failed to find it in > `pu`), Thanks, I think I was waiting for an Ack or two, but then the thread was buried.

Re: [PATCH 4/5] send-email: fix regression in sendemail.identity parsing

2019-05-18 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Fix a regression in my recent 3494dfd3ee ("send-email: do defaults -> > config -> getopt in that order", 2019-05-09). I missed that the > $identity variable needs to be extracted from the command-line before > we do the config reading, as it determines which con

Re: [RFC PATCH 3/3] list-objects-filter: implement composite filters

2019-05-18 Thread Junio C Hamano
Matthew DeVore writes: > My justification for the URL-encoding scheme is: > ... > 3. Continuing to use a single filter line seemed the least > disruptive considering both this codebase and Git clones like > JGit. Other clones will likely fail saying "unknown filter > combine:" or something like t

Re: [PATCH v2] Makefile: remove the NO_R_TO_GCC_LINKER flag

2019-05-18 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > It's not needed to simply link to libraries like say libpcre, > but *only* for those cases where we're linking to such a library not > present in the OS's library directories. See e.g. ldconfig(8) on Linux > for more details. > > I use this to compile my git wit

Re: Finer timestamps and serialization in git

2019-05-18 Thread Philip Oakley
On 16/05/2019 00:40, Eric S. Raymond wrote: Jason Pyeron : If we take the below example: committer Name 1557948240 -0400 and we follow the rule that: 1. any trailing zero after the decimal point MUST be omitted 2. if there are no digits after the decimal point, it MUST be omitted This wo

Re: Missing branches after clone

2019-05-18 Thread Philip Oakley
On 18/05/2019 13:17, Duy Nguyen wrote: On Tue, May 14, 2019 at 6:10 PM Philip Oakley wrote: It is a 'branch which tracks a remote', and it is has the 'last time I looked' state of the branch that is on the remote server, which may have, by now, advanced or changed. So you need to have the thre

Re: Command to list Branches on a specific Remote (i.e. select from rtb's)

2019-05-18 Thread Philip Oakley
Hi Ævar, On 18/05/2019 19:37, Ævar Arnfjörð Bjarmason wrote: On Sat, May 18 2019, Philip Oakley wrote: Hi, I'm unsure if there is a command for this. Currently I have 1600+ remote tracking branches (rtb) for my Git repo as it covers both git.git and git-for-windows and some other contributors

Re: [PATCH] make slash-rules more readable

2019-05-18 Thread Philip Oakley
Hi Adam On 18/05/2019 15:07, Dr. Adam Nielsen wrote: + - If the pattern contains no slash or only a trailing slash, + the pattern is matched against all files and folders (recursively) + from the location of the `.gitignore` file. + For example, `frotz/` matches `frotz` and `a/frotz` that

Re: Command to list Branches on a specific Remote (i.e. select from rtb's)

2019-05-18 Thread Ævar Arnfjörð Bjarmason
On Sat, May 18 2019, Philip Oakley wrote: > Hi, > I'm unsure if there is a command for this. > > Currently I have 1600+ remote tracking branches (rtb) for my Git repo > as it covers both git.git and git-for-windows and some other > contributors. > > Finding a specific rtb for a particular remote

Re: Git config "ignorecase = true" has issues

2019-05-18 Thread Johannes Sixt
Am 18.05.19 um 14:58 schrieb Ax Da: > You can rename files like this: > git mv File.txt file.txt On a case-insensitive, case-preserving filesystem, a case-only rename operation is better performed in two steps that do not just change the case: git mv File.txt file.txtx git mv file.txtx file.txt

Command to list Branches on a specific Remote (i.e. select from rtb's)

2019-05-18 Thread Philip Oakley
Hi, I'm unsure if there is a command for this. Currently I have 1600+ remote tracking branches (rtb) for my Git repo as it covers both git.git and git-for-windows and some other contributors. Finding a specific rtb for a particular remote looks like there ought to be a simple command ready to

Re: Feedback on git-restore

2019-05-18 Thread Philip Oakley
Hi Duy, On 16/05/2019 13:44, Duy Nguyen wrote: On Thu, May 16, 2019 at 7:12 PM Philip Oakley wrote: Maybe we need a `git index` command to make it far more visible to average users (or `git staging-area --show`, with a --cached option ;-). Not commenting on the other parts (and also Junio's m

[PATCH] make slash-rules more readable

2019-05-18 Thread Dr. Adam Nielsen
gitignore.txt: make slash-rules more readable Make all paragraphs valid, even if they are not read in strict order. Make paragraph better understandable for pattern without slash. Add sentece and example for pattern with slash. Be precise whenever a trailing slashe would make a difference. Add so

[PATCH] make slash-rules more readable

2019-05-18 Thread Dr. Adam Nielsen
gitignore.txt: make slash-rules more readable Make all paragraphs valid, even if they are not read in strict order. Make paragraph better understandable for pattern without slash. Add sentece and example for pattern with slash. Be precise whenever a trailing slashe would make a difference. Add so

Re: [PATCH] make slash-rules more readable

2019-05-18 Thread Dr. Adam Nielsen
On 18.05.19 08:42, Johannes Sixt wrote: Am 17.05.19 um 23:43 schrieb Dr. Adam Nielsen: Another thing that I noticed is that its not mentioned anywhere that the pattern use a slash as a directory separator (instead of a backslash), its only clear from the examples. Maybe its worth to mention i

Re: Git config "ignorecase = true" has issues

2019-05-18 Thread Ax Da
Anyone who likes to fix this issue? --- Gesendet: Sonntag, 05. Mai 2019 um 12:11 Uhr Von: "Ax Da" An: unlisted-recipients:; Cc: git@vger.kernel.org Betreff: Re: Git config "ignorecase = true" has issues Thanks for replying. Do you know how the query you mentioned

Re: Missing branches after clone

2019-05-18 Thread Duy Nguyen
On Tue, May 14, 2019 at 6:10 PM Philip Oakley wrote: > >> It is a 'branch which tracks a remote', and it is has the 'last time I > >> looked' state of the branch that is on the remote server, which may > >> have, by now, advanced or changed. > >> > >> So you need to have the three distinct views i

Re: Revision walking, commit dates, slop

2019-05-18 Thread SZEDER Gábor
On Sat, May 18, 2019 at 01:17:06PM +0900, Mike Hommey wrote: > On Sat, May 18, 2019 at 12:58:28PM +0900, Mike Hommey wrote: > > On Sat, May 18, 2019 at 03:50:05AM +0200, SZEDER Gábor wrote: > > > On Sat, May 18, 2019 at 09:54:12AM +0900, Mike Hommey wrote: > > > > There are established corner cases

Re: [PATCH] worktree add: be tolerant of corrupt worktrees

2019-05-18 Thread Duy Nguyen
On Fri, May 17, 2019 at 2:46 PM Eric Sunshine wrote: > > On Mon, May 13, 2019 at 6:50 AM Nguyễn Thái Ngọc Duy > wrote: > > find_worktree() can die() unexpectedly because it uses real_path() > > instead of the gentler version. When it's used in 'git worktree add' [1] > > and there's a bad worktre

Re: [PATCH] clone: add `--remote-submodules` flag

2019-05-18 Thread Duy Nguyen
On Fri, May 17, 2019 at 12:50 AM Ben Avison wrote: > > On 16/05/2019 12:31, Duy Nguyen wrote: > > On Tue, May 14, 2019 at 2:46 AM Ben Avison wrote: > >> > >> When using `git clone --recurse-submodules` there was previously no way to > >> pass a `--remote` switch to the implicit `git submodule upd

Re: [PATCH 2/2] index-pack: prefetch missing REF_DELTA bases

2019-05-18 Thread Duy Nguyen
On Fri, May 17, 2019 at 3:55 PM Jeff King wrote: > > On Fri, May 17, 2019 at 02:20:42PM +0700, Duy Nguyen wrote: > > > On Fri, May 17, 2019 at 12:35 PM Jeff King wrote: > > > As it turns out, index-pack does not handle these complicated cases at > > > all! In the final fix_unresolved_deltas(), we

[PATCH v4 0/2] nd/merge-quit updates

2019-05-18 Thread Nguyễn Thái Ngọc Duy
Another round because apparently the test case is not perfect. Nguyễn Thái Ngọc Duy (2): merge: remove drop_save() in favor of remove_merge_branch_state() merge: add --quit Documentation/git-merge.txt | 4 branch.c| 11 --- branch.h| 6 +

[PATCH v4 2/2] merge: add --quit

2019-05-18 Thread Nguyễn Thái Ngọc Duy
This allows to cancel the current merge without resetting worktree/index, which is what --abort is for. Like other --quit(s), this is often used when you forgot that you're in the middle of a merge and already switched away, doing different things. By the time you've realized, you can't even contin

[PATCH v4 1/2] merge: remove drop_save() in favor of remove_merge_branch_state()

2019-05-18 Thread Nguyễn Thái Ngọc Duy
Both remove_branch_state() and drop_save() delete almost the same set of files about the current merge state. The only difference is MERGE_RR but it should also be cleaned up after a successful merge, which is what drop_save() is for. Make a new function that deletes all merge-related state files

Re: How to update Git's metadata without affecting working dir?

2019-05-18 Thread Rocky Ji
Hi Philip Oakley, Minor correction: the Google groups question is a duplicate of this & not the other way around. My first mail to git[at]vger.kernel.org got rejected, claiming some virus reason (I don't even know C or OS basics, server is just blaming me). So I reposted it from live-ubuntu machi

From Michelle

2019-05-18 Thread Michelle
Hallo Schatz, wie geht es dir heute? Ich hoffe, es geht dir gut, bitte, ich möchte Wenn Sie meine Nachricht erhalten, brauche ich Ihre dringende Antwort. Vielen Dank Deine Michelle