[PATCH 6/6] revisions: list all worktree HEADs with --all

Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Notes: Note that ever since f0298cf (revision walker: include a detached HEAD in --all, 2009-01-16) the documentation failed to mention the inclusion of HEAD with "--all". Documentation/rev-list-options.

Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info

Stefan Beller venit, vidit, dixit 23.02.2016 23:21: > On Tue, Feb 23, 2016 at 12:46 PM, H. Peter Anvin wrote: >> On February 23, 2016 12:35:12 PM PST, Junio C Hamano >> wrote: >>> ebied...@xmission.com (Eric W. Biederman) writes: >>> Junio C Hamano

Re: [PATCH] tests: rename work-tree tests to *work-tree*

Junio C Hamano venit, vidit, dixit 20.02.2016 22:42: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> "Work tree" or "working tree" is the name of a checked out tree, >> "worktree" the name of the command which manages several

[PATCH] tests: rename work-tree tests to *work-tree*

104, t7011 and t7012 are about the "skip-worktree" flag so that their name should remain unchanged. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Just some housekeeping. Not super necessary, but should make it easier to find the right test to amend, f

Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs

Junio C Hamano venit, vidit, dixit 10.02.2016 18:45: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> Second call for help. Any comments on this from anybody other than >>> the author that I missed to support this change? >> >> OK, applied it

Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs

Junio C Hamano venit, vidit, dixit 09.02.2016 23:25: > Junio C Hamano writes: > >> Dickson Wong writes: >> >>> When invoking default (g)vimdiff three-way merge, the merged file is >>> loaded as the first buffer but moved to the bottom as the fourth

Re: Merging branches with smudge filter

[Please bottom-reply on this list] Leonardo venit, vidit, dixit 08.02.2016 18:52: > Hi. I understand what you mean, but if that's the case, I don't get > how every file was merged successfully despite the encryption, except > two of them. I thought the smudge filter was supposed to be applied to >

Re: [PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh

[warning: experimenting with forwarding to and replying from gmail...] 2016-02-08 14:50 GMT+01:00 Jeff King <p...@peff.net>: > On Sun, Feb 07, 2016 at 08:11:37PM +0100, Michael J Gruber wrote: > >> bcb11f1 (mingw: mark t9100's test cases with appropriate prereqs, 2016-01-27) &g

[PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh

it message anyways (exec.sh is never executed). Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- t/t9100-git-svn-basic.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 5464b5b..936913c 100755 -

Re: [RFC] tag-ref and tag object binding

Junio C Hamano venit, vidit, dixit 27.01.2016 19:10: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> Jeff King venit, vidit, dixit 27.01.2016 09:09: >> >>> The bigger issue is that gpg seems to give us only _one_ uid, when there >>> may

Re: [RFC] tag-ref and tag object binding

Jeff King venit, vidit, dixit 27.01.2016 09:09: > On Wed, Jan 27, 2016 at 08:53:08AM +0100, Michael J Gruber wrote: > >>> Yeah, definitely. My thinking was that `verify-tag` could learn a series >>> of optional consistency checks, enabled by command line options, an

Re: [RFC] tag-ref and tag object binding

Santiago Torres venit, vidit, dixit 25.01.2016 22:22: > Hello everyone. > > I've done some further research on the security properties of git > metadata and I think I've identified something that might be worth > discussing. In this case, The issue is related to the refs that point to > git tag

Re: [RFC] tag-ref and tag object binding

Jeff King venit, vidit, dixit 26.01.2016 21:26: > On Tue, Jan 26, 2016 at 10:29:42AM -0500, Santiago Torres wrote: > >>> If you cannot trust those with write access to a repo that you are >>> pulling and installing from you might want to re-check where you are >>> pulling or installing from ;) >>

Re: [RFC] tag-ref and tag object binding

Jeff King venit, vidit, dixit 27.01.2016 08:33: > On Wed, Jan 27, 2016 at 08:23:02AM +0100, Michael J Gruber wrote: > >>> Tag objects already have a "tag" header, which is part of the signed >>> content. If you use "git verify-tag -v", you ca

Re: [PATCH] git.c: fix help.autocorrect after 57ea712 breaks it

eated as the first "alias", and it can be resolved to > the second alias. Then boom. > > Make sure we call save_env() and restore_env() in pairs. While at there, > set orig_cwd to NULL after freeing it for hygiene. > > Reported-by: Michael J Gruber <g...@drmicha.w

[BUG] typo DWIMery with alias broken (cd to random dir)

Hi there, with current next (989ee58 plus local additions) it seems that typo DWIMery with aliases is broken, see below. It appears that the typo DWIMery is broken only when there is a unique automatic DWIM substitution for a mistyped alias. I haven't bisected yet, but I suspect this to be

Re: [BUG?] worktree setup broken in subdirs with git alias

Michael J Gruber venit, vidit, dixit 07.01.2016 10:40: > Duy Nguyen venit, vidit, dixit 07.01.2016 10:26: >> On Thu, Jan 7, 2016 at 2:15 PM, Michael J Gruber >> <g...@drmicha.warpmail.net> wrote: >>> Hi there, >>> >>> sorry I can't dig deeper now,

[BUG?] worktree setup broken in subdirs with git alias

Hi there, sorry I can't dig deeper now, but the worktree code from next seems to get confused now as soon as you cd to a subdir of a worktree (other than the main worktree) and use an alias: git help ss `git ss' is aliased to `status -s -b' [mjg@skimbleshanks Biomath-WS15 (exam $)]✓ git status

Re: [PATCHv2] builtin/clone: support submodule groups

Stefan Beller venit, vidit, dixit 30.11.2015 20:31: > + cc Duy, Michael, who discussed the sparse checkout recently > > On Wed, Nov 25, 2015 at 9:00 PM, Trevor Saunders > wrote: >> Seeing the recent sparse checkout discussion I realized it might be >> useful to have a

Re: Sparse checkout in worktree

Duy Nguyen venit, vidit, dixit 25.11.2015 20:38: > On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber > <g...@drmicha.warpmail.net> wrote: >> Hi there, >> >> I'm wondering how much it would take to enable worktree specific sparse >> checkouts. From a sup

Re: Sparse checkout in worktree

Duy Nguyen venit, vidit, dixit 25.11.2015 21:17: > On Wed, Nov 25, 2015 at 8:44 PM, Michael J Gruber > <g...@drmicha.warpmail.net> wrote: >> Duy Nguyen venit, vidit, dixit 25.11.2015 20:38: >>> On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber >>> <g.

Sparse checkout in worktree

Hi there, I'm wondering how much it would take to enable worktree specific sparse checkouts. From a superfluous look: - $GIT_DIR/info/sparse_checkout needs to be worktree specific - We don't have much tooling around sparse to speak of at all. The endgoal would be to have something like git

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

com/peff/git/ > > But note that I will _not_ be pushing to kernel.org. Does peff/git include the integration branches, too? Also, that one should be uncontroversial (f[l]amous last words): From: Michael J Gruber <g...@drmicha.warpmail.net> Subject: [PAT

[PATCH] Documentation/diff: give --word-diff-regex=. example

It's just so useful. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Documentation/diff-options.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index d56ca90..306b7e3 100644 --- a/Documentatio

Re: Three dot notion used inconsitent?

Andreas Schwab venit, vidit, dixit 18.11.2015 18:49: > Lars Schneider writes: > >> git diff branchA...branchB >> --> gives me the diff between (the common ancestor of A and B) and B. That >> means I never see changes on branchA. >> >> git log branchA...branchB >> -->

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

Mike Rappazzo venit, vidit, dixit 17.11.2015 14:58: > (This message is off list) [cut the message part, though no big secrets there] Hi Mike, I don't think there's a point in discussing this off-list. Your intentions are clearer now, yes, or else I would have asked more. I still don't like the

--color-diff='.' considered useful

git tip of the day: git diff --color-words='.' git show --color-words='.' That will help you find that 1 character change that a failed default word split hides from your eyes. I guess everyone here will know already, but I found that super useful and much easier than trying to get a

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

Michael Rappazzo venit, vidit, dixit 11.11.2015 03:11: > This patch series is built on (based on) 'next' because it relies on > worktree.c > > `ff-refs` will update local branches which can be fast-forwarded to their > upstream tracking branch. Any branch which has diverged from the upstream >

[RFD/WIP PATCH] rev-list: list all heads with --all

d the HEADs from all worktrees. This results in a non-worktree-specific ref list amd solves the pruning problem. Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- This patch solves the pruning problem with worktrees, but I feel quite uneasy about substituting the ref solving at

Re: git log --author=me

Duy Nguyen venit, vidit, dixit 02.11.2015 19:37: > On Mon, Nov 2, 2015 at 2:27 PM, Harry Jeffery wrote: >> Hi, >> >> I've written a patch that allows `me` to be used as shorthand for >> $(user.name) or $(user.email) in the `--author` and `--commiter` fields. >> >> The purpose

Re: git filter-branch and merging of signed tags

Uwe Kleine-König venit, vidit, dixit 02.11.2015 09:04: > Hello, > > Consider I want to rewrite a commit that is a merge of a signed tag. In > my case that's 064ca93f7ab927c2752d86fc5727716e340d737c that currently > sits in linux-next: > > ~/gsrc/linux$ git version > git version 2.6.1

Re: Hacking git for managing machine readable "source" files

Christian Gagneraud venit, vidit, dixit 12.10.2015 05:32: > Hi git hackers, > > I have been scratching my head since quite a few weeks to see if and how > I could hack git to manage non-software-source-code files. Theses files > might be text-based (XML, JSON, custom format, ...) but are not

Re: [PATCH v2] filter-branch: remove multi-line headers in msg filter

Junio C Hamano venit, vidit, dixit 09.10.2015 19:53: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> Set IFS to an empty string for the “read” call, thus disabling the word >>> splitting, which causes $header_line to be set to the non-empty value

Re: [PATCH v2] filter-branch: remove multi-line headers in msg filter

fore > emitting the original, intact commit message. > > Signed-off-by: James McCoy <vega.ja...@gmail.com> > --- Thanks for hanging in :) Reviewed-by: Michael J Gruber <g...@drmicha.warpmail.net> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [BUG] GIT_INDEX environment variable ignored?

McAuley, Ben venit, vidit, dixit 08.10.2015 06:48: > Hello, > > I was trying to use multiple indexes earlier, and ran into an issue which > I've summarised into a test case: > > $ git init > $ touch file1 && git add file1 && git commit -m "file1" > $ git branch release > $ touch file2 && git

Re: [PATCH] filter-branch: strip pgp signature in commit messages

James McCoy venit, vidit, dixit 08.10.2015 07:01: > df062010 (filter-branch: avoid passing commit message through sed) > introduced a regression when filtering gpg signed commits. The gpgsig > header is multi-line and contains an empty line. Although the signature > is indented, making the line

Re: [PATCH] filter-branch: strip pgp signature in commit messages

Michael J Gruber venit, vidit, dixit 08.10.2015 10:15: > James McCoy venit, vidit, dixit 08.10.2015 07:01: ... > [No, this does not alleviate my dislike for the commit signature > implementation, and I have not checked the patch - the test looks good > to me, though.] OK, now gru

Re: [PATCH] filter-branch: strip pgp signature in commit messages

Michael J Gruber venit, vidit, dixit 08.10.2015 10:43: > Michael J Gruber venit, vidit, dixit 08.10.2015 10:15: >> James McCoy venit, vidit, dixit 08.10.2015 07:01: > ... >> [No, this does not alleviate my dislike for the commit signature >> implementation, and I ha

Re: Branch information (git branch/status) inconsistent when in detached HEAD state

Stijn De Ruyck venit, vidit, dixit 06.10.2015 15:03: > Hello, > > Consider a repository with a develop branch tracking origin/develop and where > HEAD = 545a36f = develop = origin/develop. > Tested with Git 2.4.3 and 1.8.3.4 on Linux. > > 1) git checkout develop > 2) git branch | head -1 (or

Re: [BUG?] parallel make interdepencies

John Keeping venit, vidit, dixit 06.10.2015 15:33: > On Tue, Oct 06, 2015 at 03:13:05PM +0200, Johannes Schindelin wrote: >> Hi Michael, >> >> On 2015-10-06 10:12, Michael J Gruber wrote: >>> "make -j3" just errored out on me, a follow-up "make"

Re: [PATCH] completion: fix completion after 'git -C path'

SZEDER Gábor venit, vidit, dixit 05.10.2015 14:02: > The main completion function finds the name of the git command by > iterating through all the words on the command line in search for the > first non-option-looking word. As it is not aware of 'git -C's > mandatory path argument, if the '-C

[BUG?] parallel make interdepencies

"make -j3" just errored out on me, a follow-up "make" succeeded". This looks like an interdependency issue, but I don't know how to track it: GEN git-web--browse GEN git-add--interactive GEN git-difftool mv: der Aufruf von stat für „perl.mak“ ist nicht möglich: Datei oder Verzeichnis

Re: git rev-list --all --reflog does not include worktree references

Andreas Schwab venit, vidit, dixit 05.10.2015 21:08: > When running git rev-list --all --reflog in the main worktree it doesn't > include commits only referenced by the worktrees, neither HEAD nor its > reflog. HEAD is per worktree, so other worktrees' HEADs should not be included in "--all", I

[PATCH] t2026: rename worktree prune test

"git prune". Signed-off-by: Michael J Gruber <g...@drmicha.warpmail.net> --- Noted while looking into the "git prune" issue and trying to find a place for "git prune" tests with extra worktrees. t/{t2026-prune-linked-checkouts.sh => t2026-worktree-prune.sh}

Re: [PATCH 2/2] status: don't say 'HEAD detached at HEAD'

Matthieu Moy venit, vidit, dixit 27.09.2015 17:13: > After using "git checkout --detach", the reflog is left with an entry > like > > checkout: moving from ... to HEAD > > This message is parsed to generate the 'HEAD detached at' message in > 'git branch' and 'git status', which leads to the

Re: Fwd: diff not finding difference

Johannes Schindelin venit, vidit, dixit 25.09.2015 12:11: > Hi Jack Adrian, > > On 2015-09-24 23:09, Jack Adrian Zappa wrote: >> This is a weird one: >> >> [file-1 begin] >> >> abcd efg hijklmnop >> >> [file-1 end] >> >> [file-2 begin] >> >> blah blah blah >>

Re: Formatting error in page http://git-scm.com/docs/user-manual

John Keeping venit, vidit, dixit 25.09.2015 14:59: > On Fri, Sep 25, 2015 at 03:38:02PM +0300, Valentin VALCIU wrote: >> There is a formatting error in the source code of page >> http://git-scm.com/docs/user-manual that makes almost half of it be >> rendered in a element displaying the page

Re: [BUG?] HEAD detached at HEAD

... in addition to my previous reply, looking at more context: >> --- a/wt-status.c >> +++ b/wt-status.c >> @@ -1319,6 +1319,13 @@ static int grab_1st_switch(unsigned char *osha1, >> unsigned char *nsha1, >> hashcpy(cb->nsha1, nsha1); >> for (end = target; *end && *end != '\n';

Re: [BUG?] HEAD detached at HEAD

Matthieu Moy venit, vidit, dixit 18.09.2015 21:09: > Stefan Beller writes: > >> On Fri, Sep 18, 2015 at 10:23 AM, Matthieu Moy >> wrote: >>> Jacob Keller writes: >>> On Fri, Sep 18, 2015 at 9:59 AM, Matthieu Moy

Re: [PATCH] git-svn: parse authors file more leniently

Eric Wong venit, vidit, dixit 10.09.2015 20:08: > Michael J Gruber <g...@drmicha.warpmail.net> wrote: >> Instead, make git svn uses the perl regex >> >> /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/ >> >> for parsing the authors file so that the

Re: git clone svn: authors from authors file are ignored, authors-prog works, but crashes on branch points

Till Schäfer venit, vidit, dixit 26.08.2015 21:57: > Hi, > i am observing some weired "git svn clone" behavior during my try to migrate > the Scaffold Hunter [1] SVN repository [2] to Git: > > if i just use the command > > $ git svn clone svn://svn.code.sf.net/p/scaffoldhunter/code

[PATCH] git-svn: parse authors file more leniently

p/authors as the authors file directly. Instead, make git svn uses the perl regex /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/ for parsing the authors file so that the same (slightly more lenient) regex is used in both cases. Reported-by: Till Schäfer <till2.schae...@tu-

Re: Standardization of messages - dot after the sentence

Junio C Hamano venit, vidit, dixit 08.09.2015 20:16: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >> sigo venit, vidit, dixit 05.09.2015 14:22: >>> I've found really "little bug" with dots in the git output. >>> >>> $ git push &g

Re: Git's inconsistent command line options

Stefan Beller venit, vidit, dixit 01.09.2015 19:56: > On Tue, Sep 1, 2015 at 10:50 AM, Barry Warsaw wrote: >> On Sep 01, 2015, at 09:42 AM, Junio C Hamano wrote: >> >>> That way, you are forcing all the existing scripts to be updated to >>> say "git -c ..." for _all_ invocations

Re: Git's inconsistent command line options

David Aguilar venit, vidit, dixit 01.09.2015 11:28: > On Mon, Aug 31, 2015 at 10:25:58AM -0400, Barry Warsaw wrote: >> On Aug 31, 2015, at 05:10 PM, Duy Nguyen wrote: >> >>> I'm probably shot down for this. But could we go with a clean plate >>> and create a new command prefix (something like

Re: Standardization of messages - dot after the sentence

sigo venit, vidit, dixit 05.09.2015 14:22: > I've found really "little bug" with dots in the git output. > > $ git push > Everything up-to-date > > git pull > Already up-to-date. > > Could all phrases contain dots? :) > In this case, also both messages mean the same but are phrased

Re: git grep broken in Fedora 21 update?

Jacob Keller venit, vidit, dixit 04.09.2015 06:55: > On Thu, Sep 3, 2015 at 5:04 PM, Rustad, Mark D > wrote: >> I just found a case where grep and git grep yield different results. Inside >> the ixgbe directory of the Linux kernel I did: >> >> $ grep enter_lplu *.[ch]

Re: [PATCH] graph.c: visual difference on subsequent series

Junio C Hamano venit, vidit, dixit 03.09.2015 19:13: > Michael J Gruber <g...@drmicha.warpmail.net> writes: > >>> Is the design of your independent implementation the same except >>> that 'o' is used instead of 'x'? Independent implementation does >>> no

Re: [PATCH] graph.c: visual difference on subsequent series

Junio C Hamano venit, vidit, dixit 27.07.2015 22:17: > Antoine Beaupré writes: > >> Any reason why this patch wasn't included / reviewed? >> ... >>> This patch is similar than the one provided by Milton Soares Filho in >>>

Re: Config variables and scripting // was Re: [RFC/PATCH] log: add log.firstparent option

Jacob Keller venit, vidit, dixit 23.07.2015 08:55: On Wed, Jul 22, 2015 at 11:53 PM, Jeff King p...@peff.net wrote: man git already has such a list (which is generated from the annotations in command-list.txt). But I agree that it would probably be helpful to point people directly from git log

Re: Feature Request: Passing a number as an option to git tags for displaying latest tags

Junio C Hamano venit, vidit, dixit 22.07.2015 21:20: Junio C Hamano gits...@pobox.com writes: The former, sort by time, is interesting, but you need to define what to do with various corner cases. For example, some people may have one or more of the following desires: * My project did

Re: A few linked checkout niggles

Two more observations: $ git worktree add /tmp/gitwt Enter /tmp/gitwt (identifier gitwt) Switched to a new branch 'gitwt' Now I'm in /tmp/gitwt at branch gitwt. Right? No. I'm in the original wd at the original branch. So either we cd to the new location or quelch these messages or add a

Re: [PATCH 00/16] worktree: use git reset --hard to populate worktree

Junio C Hamano venit, vidit, dixit 13.07.2015 20:36: Eric Sunshine sunsh...@sunshineco.com writes: This is a follow-on series to [1], which migrated git checkout --to functionality to git worktree add. That series continued using git checkout for the initial population of the new worktree,

Re: Draft of Git Rev News edition 5

Eric Sunshine venit, vidit, dixit 06.07.2015 01:12: On Sun, Jul 5, 2015 at 6:35 PM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Mon, Jul 6, 2015 at 12:01 AM, Eric Sunshine sunsh...@sunshineco.com wrote: Unfortunately, the non-ASCII characters in Duy's name got corrupted, and the

Re: Using clean/smudge filters with difftool

Junio C Hamano venit, vidit, dixit 19.06.2015 19:03: Michael J Gruber g...@drmicha.warpmail.net writes: Now, since external diff runs on smudged blobs, it appears as if we mixed cleaned and smudged blobs when feeding external diffs; whereas really, we mix worktree blobs and smudged repo

Re: Visualizing merge conflicts after the fact (using kdiff3)

Junio C Hamano venit, vidit, dixit 18.06.2015 17:57: Michael J Gruber g...@drmicha.warpmail.net writes: This type of request comes up often (for a reason). I'm wondering whether we could support it more systematically, either by exposing the steps above as a command, or by storing

[PATCH] mergetool-lib: fix default tool selection

IFS for difftool and mergetool, 2015-05-20) introduced a newline as IFS which breaks the parsing of the space separated list into items, resulting in a failed search for an available tool. Set IFS to a space locally for the tool search. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net

Re: Using clean/smudge filters with difftool

Junio C Hamano venit, vidit, dixit 19.06.2015 00:55: John Keeping j...@keeping.me.uk writes: I think the summary is that there are some scenarios where the external diff tool should see the smudged version and others where the clean version is more appropriate and Git should support both

Re: Using clean/smudge filters with difftool

Florian Aspart venit, vidit, dixit 16.06.2015 16:11: Hi everyone, I created a clean filter to apply on some files before commiting them. The filter works correctly when I commit the file and is also applied when I usethe iff command line tool. However, when using difftool with meld, the

Re: Visualizing merge conflicts after the fact (using kdiff3)

Johannes Schindelin venit, vidit, dixit 16.06.2015 11:43: Hi Eric, On 2015-06-16 03:17, Eric Raible wrote: I'm running 1.9.5.msysgit.1, but this is a general git question... Upon returning from a vacation, I was looking at what people had been up to, and discovered on merge in which a

Re: [PATCH 0/3] Raw gpg output support for verify-commit and verify-tag

Junio C Hamano venit, vidit, dixit 14.06.2015 23:23: brian m. carlson sand...@crustytoothpaste.net writes: Currently, verify-commit and verify-tag produce human-readable output. This is great for humans, and awful for machines. It also lacks a lot of the information that GnuPG's --status-fd

gitscm vs. git-scm

Hi there, I (mis-) remembered the git site address and noticed that gitscm.com returns empty while git-scm.com is our beloved home. I thought, though, that we have a couple domains with redirects but I may be misremembering that also. Or DNS is hicking up. Cheers, Michael -- To unsubscribe from

Re: gitscm vs. git-scm

Matthieu Moy venit, vidit, dixit 09.06.2015 15:08: Michael J Gruber g...@drmicha.warpmail.net writes: Hi there, I (mis-) remembered the git site address and noticed that gitscm.com returns empty while git-scm.com is our beloved home. I thought, though, that we have a couple domains

Re: [PATCH] receive-pack: Create a HEAD ref for ref namespace

Johannes Löthberg venit, vidit, dixit 05.06.2015 13:53: Ping. -- Sincerely, Johannes Löthberg (Sent from my phone.) It appears your patch proposes to fix a problem. It's a good idea to expose the problem by writing a test so that one can check that the fix actually fixes the problem.

Re: [PATCH] l10n: de.po: translate index as Index

phillip venit, vidit, dixit 01.06.2015 17:10: Hi, #: sequencer.c:661 #, c-format msgid git %s: failed to read the index -msgstr git %s: Fehler beim Lesen der Staging-Area +msgstr git %s: Fehler beim Lesen des Indexes Now we have to decide whether we flex Index like a foreign

Re: [PATCH] l10n: de.po: translate index as Index

Christian Stimming venit, vidit, dixit 01.06.2015 22:00: Am Montag, 1. Juni 2015, 12:34:31 schrieb Stefan Beller: On Mon, Jun 1, 2015 at 12:26 PM, Christian Stimming stimm...@tuhh.de wrote: index concept, my explanation routinely says This concept is called 'index' but it has nothing to do

[RFC/PATCH 2/2] messages: uniform error messages for index write

temporary in place and add TRANSLATORS note. It may happen that the index file is writable but not the temporary one. * Leave pack-write.c alone. It is low level without l10n. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- I am actually a bit torn on the temporary index

[PATCH 1/2] show-index: uniform error messages for index read

for the rerere messages: They appear on a higher level (index file access + parsing) and are worded similarly to other rerere messages. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/commit.c | 2 +- show-index.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git

Re: [PATCH] git-new-workdir: add windows compatibility

Johannes Schindelin venit, vidit, dixit 26.05.2015 14:35: Hi Paul, On 2015-05-26 14:20, Paul Smith wrote: On Tue, 2015-05-26 at 11:53 +0200, Johannes Schindelin wrote: The biggest problem with `mklink` is that it is only supported on Windows Vista and later, while I really like to keep

Re: Staging commits with visual diff tools?

John Lee venit, vidit, dixit 27.05.2015 09:34: On Wed, 27 May 2015, Jeff King wrote: If you are interested in looking further, see how the %patch_mode hash is defined in git-add--interactive.perl. Specifically, note that add -p is just one case: diff against the index and apply with apply

[PATCHv2 4/4 (was 3/3, still WIP)] t/lib-git-svn: adjust config to apache 2.4 WIP

The current config is tailored to apache 2.2. Apache 2.4 fails to start with it. Adjust the config to apache 2.4. [still incomplete] Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Notes: This is WIP and RFH. Apache does not start without mpm, and the lock mechanism has

[PATCHv2 2/4] t/lib-git-svn: check same httpd module dirs as lib-httpd

Currently, lib-git-svn checks a proper subset of the paths that lib-httpd checks for apache modules. Make it check the same set so that apache is run by one when it is run by the other (provided ports have been set and there are no other configuration issues). Signed-off-by: Michael J Gruber g

[PATCHv2 0/4] Make httpd tests run v2

v2 updates the commit messages as per the dicsussion after v1 and adds a clean-up. 1/4, 2/4 are ready to go as discussed (commit messages updated). 3/4 is a new independent cleanup noted while being there. 4/4 is the old 3/3 and still WIP. Please hold back. Michael J Gruber (4): t/lib-httpd

[PATCHv2 1/4] t/lib-httpd: load mod_unixd

the httpd tests run. This does not affect distros negatively which have that config already in their default (Debian type). httpd tests will run on these before and after this patch. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- t/lib-httpd/apache.conf | 3 +++ 1 file changed, 3

Re: Why does git log -Gregex works with regexp-ignore-case but not with other regexp-related options?

Junio C Hamano venit, vidit, dixit 21.04.2015 18:59: Michael J Gruber g...@drmicha.warpmail.net writes: We have engine-switching options and engine-modification options. The latter are certainly good in the expression itself. Maybe even the former, though I don't know how to switch away from

Re: Why does git log -Gregex works with regexp-ignore-case but not with other regexp-related options?

Junio C Hamano venit, vidit, dixit 20.04.2015 20:44: Linus Torvalds torva...@linux-foundation.org writes: And to clarify: I don't suggest always building with libpcre. I literally suggest having something like /* hacky mac-hack hack */ if (strncmp((?i), p-pattern, 4)) {

Re: Why does git log -Gregex works with regexp-ignore-case but not with other regexp-related options?

Junio C Hamano venit, vidit, dixit 17.04.2015 19:45: On Fri, Apr 17, 2015 at 7:26 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Similarly I think it is not very consistent that one cannot combine any of the above options with the Sstring but instead have yet another option called

[PATCH] rev-list-options.txt: complete sentence about notes matching

Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Documentation/rev-list-options.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index f620ee4..77ac439 100644 --- a/Documentation/rev

Re: Why does git log -Gregex works with regexp-ignore-case but not with other regexp-related options?

Tim Friske venit, vidit, dixit 17.04.2015 12:00: Hi, I wonder why git log -Gregexp works with the regexp-ignore-case option but not with the other regexp-related options? Wouldn't it be useful to make the Gregex option support the following options? * basic-regexp * extended-regexp

Re: support git+mosh for unreliable connections

: On Wednesday 15 April 2015 07:22 PM, Michael J Gruber wrote: What would that require git to do, beyond taking whatever you tell it (using GIT_SSH or _GIT_SSH_COMMAND) to use as a drop in replacement for ssh? May be support git+mosh as a protocol, since it is not a drop in replacement

Re: support git+mosh for unreliable connections

Pirate Praveen venit, vidit, dixit 15.04.2015 15:07: Hi, When working with big projects over a slow, unreliable connection, currently there is no way to resume a clone or pull when the connection breaks. mosh is a better replacement for ssh over unreliable connections. supporting git+mosh

Re: git fsck: unreachable vs. dangling

Junio C Hamano venit, vidit, dixit 14.04.2015 10:05: On Tue, Apr 14, 2015 at 12:16 AM, Sebastian Schuberth sschube...@gmail.com wrote: Hi, reading through the fsck docs [1] I'm having a hard time understanding what the difference between unreachable and dangling objects are. By example,

Re: git fsck: unreachable vs. dangling

Junio C Hamano venit, vidit, dixit 14.04.2015 11:22: Sebastian Schuberth sschube...@gmail.com writes: On Tue, Apr 14, 2015 at 10:50 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: to dangle means to hang loosely. So, in the description above, A^ dangles from A loosely because

Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4

Jeff King venit, vidit, dixit 10.04.2015 05:39: On Fri, Apr 10, 2015 at 05:23:17AM +0200, Jeff King wrote: Curiously, though, the git-svn tests seem to run fine for me on Apache 2.4 without your patch. I wonder if the fixes I mentioned above (which I definitely needed to get the regular http

Re: Finding leaf nodes.

Jason Pyeron venit, vidit, dixit 12.04.2015 06:04: I am trying to find all the unmerged commits [5]. Unmerged to which branch? It's not clear to me which commits you are looking for. By leaf node I would describe a commit without child commits. unmerged can only be understood relative to a

Re: inexact rename detection warning on git log -p

Matthew Walster venit, vidit, dixit 13.04.2015 12:47: Out of idle curiosity, I cloned git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git and chose to generate some statistics: $ find -not -iname '.git' | wc 52154 52154 1820305 git ls-files | wc -l That's a few

Re: Git + SFC Status Update

Thanks for the report, and thanks to everyone on the committee (and the conservancy). I'm somewhat disappointed to see that violent revolutions are excluded, though ;) Seriously, keeping the scope of The Git Project (the SCF member) as limited as it is seems to be the best approach to keeping it

Re: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4

Eric Wong venit, vidit, dixit 08.04.2015 22:26: Michael J Gruber g...@drmicha.warpmail.net wrote: The current config is tailored to apache 2.2. Apache 2.4 fails to start with it. Adjust the config to apache 2.4. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- 1/3 and 2/3

Re: [PATCH 1/3] t/lib-httpd: load mod_unixd

Torsten Bögershausen venit, vidit, dixit 08.04.2015 23:47: On 2015-04-08 17.05, Michael J Gruber wrote: With the current config, apache 2.4.10 will not be started and the httpd tests will not run. Enable mod_unixd to make the httpd tests run. Signed-off-by: Michael J Gruber g

Re: gitk won't show notes?

Phillip Susi venit, vidit, dixit 07.04.2015 19:08: On 4/7/2015 10:13 AM, Michael J Gruber wrote: Seriously: gitk knows F5 and Shift-F5 for refresh, and I think the latter is the thorougher refreshment. Neither one makes newly added notes show up. The only way seems to be to close

<    1   2   3   4   5   6   7   8   >