HEADs from all worktrees. This results in
a non-worktree-specific ref list and solves the pruning problem.
Signed-off-by: Michael J Gruber
---
Notes:
This patch solves the pruning problem with worktrees, but I feel quite
uneasy about substituting the ref solving at the very heart of refs.
This still messes up gc/prune on an empty repo where the worktree code
can't parse HEAD properly. Bummer. That code sucks for the non-worktree
case.
Signed-off-by: Michael J Gruber
---
reachable.c | 2 +-
refs.h | 1 +
refs/files-backend.c
Signed-off-by: Michael J Gruber
---
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.txt | 2 +-
refs/files
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 writes:
> It is valuable for a t
Junio C Hamano venit, vidit, dixit 20.02.2016 22:42:
> Michael J Gruber writes:
>
>> "Work tree" or "working tree" is the name of a checked out tree,
>> "worktree" the name of the command which manages several working trees.
>> The n
104, t7011 and t7012 are about the "skip-worktree" flag so that their
name should remain unchanged.
Signed-off-by: Michael J Gruber
---
Just some housekeeping. Not super necessary, but should make it easier to find
the right test to amend, for example.
t/{t1501-worktree.sh => t15
Junio C Hamano venit, vidit, dixit 10.02.2016 18:45:
> Michael J Gruber 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 (on top of next), looks sane a
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 window.
>>> This causes a disconnect between vi
[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
>
[warning: experimenting with forwarding to and replying from gmail...]
2016-02-08 14:50 GMT+01:00 Jeff King :
> 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)
>> replaced
commit message anyways
(exec.sh is never executed).
Signed-off-by: Michael J Gruber
---
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
--- a/t/t9100-git-svn-basic.s
Junio C Hamano venit, vidit, dixit 27.01.2016 19:10:
> Michael J Gruber 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 be several. E.g., Junio's v2.7.0
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, and
&g
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 can check b
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 ;)
>>
is treated 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
> Signed-off-b
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 ob
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 relat
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
>> wrote:
>>> Hi there,
>>>
>>> sorry I can't dig deeper now, but the worktree code from ne
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 -s
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 similar sort of feature for
Duy Nguyen venit, vidit, dixit 25.11.2015 21:17:
> On Wed, Nov 25, 2015 at 8:44 PM, Michael J Gruber
> wrote:
>> Duy Nguyen venit, vidit, dixit 25.11.2015 20:38:
>>> On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber
>>> wrote:
>>>> Hi there,
>>
Duy Nguyen venit, vidit, dixit 25.11.2015 20:38:
> On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber
> wrote:
>> Hi there,
>>
>> I'm wondering how much it would take to enable worktree specific sparse
>> checkouts. From a superfluous look:
>>
>&
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 chec
t; and all topic branches at:
>
> https://github.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
Subject: [PATCH]
It's just so useful.
Signed-off-by: Michael J Gruber
---
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/Documentation/diff-options.txt
+++ b/Document
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
>> --> gives me the commits reachab
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
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 meaningful
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
> wi
HEADs from all worktrees. This results in
a non-worktree-specific ref list amd solves the pruning problem.
Signed-off-by: Michael J Gruber
---
This patch solves the pruning problem with worktrees, but I feel quite
uneasy about substituting the ref solving at the very heart of refs.c. So
please
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 being to make finding
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
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 int
Junio C Hamano venit, vidit, dixit 09.10.2015 19:53:
> Michael J Gruber 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 '
>>> '. This allows
nal commit.
>
> 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 '
> '. This allows the loop to fully consume the header lines before
> emitting the original, intact commit messag
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 have not
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
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 a
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 ad
hould create them. (And I'm not sure whether the HEAD reflog is the
right tool for your purpose.)
Michael
>
> -Original Message-
> From: Michael J Gruber [mailto:g...@drmicha.warpmail.net]
> Sent: Wednesday, October 07, 2015 11:07 AM
> To: Stijn De Ruyck; git@vger.ke
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 git
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"
"git prune".
Signed-off-by: Michael J Gruber
---
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} | 0
1 file changed, 0 insertion
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 wo
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 path
"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 n
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 no
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 source
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
>>
... 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'; en
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
wrote:
> I'm getting it even if there's a tag and/or a branch pointi
Eric Wong venit, vidit, dixit 10.09.2015 20:08:
> Michael J Gruber wrote:
>> 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)
>>
ed to specifying
/tmp/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
Signed-off-by: Michael
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 --no-metada
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 git-n
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 of Git they have,
Junio C Hamano venit, vidit, dixit 08.09.2015 20:16:
> Michael J Gruber writes:
>
>> 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-
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
differently
Junio C Hamano venit, vidit, dixit 03.09.2015 19:13:
> Michael J Gruber writes:
>
>>> Is the design of your independent implementation the same except
>>> that 'o' is used instead of 'x'? Independent implementation does
>>> not make
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]
>>
>> And got the following
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
>>> 1382734287.31768.1.git.send.email.milton.soares.fi...@gmail.com but was
>>
Jacob Keller venit, vidit, dixit 23.07.2015 08:55:
> On Wed, Jul 22, 2015 at 11:53 PM, Jeff King 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" to
Junio C Hamano venit, vidit, dixit 22.07.2015 21:20:
> Junio C Hamano 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 not us
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
message
Junio C Hamano venit, vidit, dixit 13.07.2015 20:36:
> Eric Sunshine 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, which requi
Eric Sunshine venit, vidit, dixit 06.07.2015 01:12:
> On Sun, Jul 5, 2015 at 6:35 PM, Thomas Ferris Nicolaisen
> wrote:
>> On Mon, Jul 6, 2015 at 12:01 AM, Eric Sunshine
>> wrote:
>>> Unfortunately, the non-ASCII characters
>>> in Duy's name got corrupted, and the botch is present in the patch I
Junio C Hamano venit, vidit, dixit 19.06.2015 19:03:
> Michael J Gruber 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"
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
---
git-mergetool--lib.sh
Junio C Hamano venit, vidit, dixit 19.06.2015 00:55:
> John Keeping 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 options. It
>
Junio C Hamano venit, vidit, dixit 18.06.2015 17:57:
> Michael J Gruber 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
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, th
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 wh
Junio C Hamano venit, vidit, dixit 14.06.2015 23:23:
> "brian m. carlson" 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 output provides.
>
Matthieu Moy venit, vidit, dixit 09.06.2015 15:08:
> Michael J Gruber 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
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
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 prob
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 f
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
> wrote:
>>> "index" concept, my explanation routinely says "This concept is called
>>> 'index' but it has nothing to do with
refers to the new state of the
index file, which is extra confusing. "checkout" does not talk about
"new work tree" (but "work tree") either. Therefore, word all of these
as "unable to write index file" (by possibly omitting "new" or "new_
return error("Could not read index");
Turn all of them into "unable to read index file" except 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
---
buil
Currently we use different messages for the same error.
Make them uniform.
Michael J Gruber (2):
show-index: uniform error messages for index read
messages: uniform error messages for index write
builtin/add.c| 2 +-
builtin/apply.c | 2 +-
builtin/checkout-index.c
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
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
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
---
Notes:
This is WIP and RFH. Apache does not start without mpm, and the lock
mechanism has changed. It will run with
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
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
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
---
t/lib-httpd/apache.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a
Junio C Hamano venit, vidit, dixit 21.04.2015 18:59:
> Michael J Gruber 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 swit
Junio C Hamano venit, vidit, dixit 20.04.2015 20:44:
> Linus Torvalds 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)) {
>> p->pattern +=
Junio C Hamano venit, vidit, dixit 17.04.2015 19:45:
> On Fri, Apr 17, 2015 at 7:26 AM, Michael J Gruber
> wrote:
>>>
>>> Similarly I think it is not very consistent that one cannot combine any of
>>> the above options with the "S" but instead have yet a
Tim Friske venit, vidit, dixit 17.04.2015 12:00:
> Hi,
>
> I wonder why "git log -G" works with the "regexp-ignore-case"
> option but not with the other regexp-related options? Wouldn't it be
> useful to make the "G" option support the following options?
>
> * basic-regexp
> * extended-regex
Signed-off-by: Michael J Gruber
---
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-list-options.txt
+++ b
>>>>
>>>> On 2015-04-15 16:18, Pirate Praveen wrote:
>>>>> 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 _G
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+
Junio C Hamano venit, vidit, dixit 14.04.2015 11:22:
> Sebastian Schuberth writes:
>
>> On Tue, Apr 14, 2015 at 10:50 AM, Michael J Gruber
>> wrote:
>>
>>> "to dangle" means "to hang loosely".
>>>
>>> So, in the description
Junio C Hamano venit, vidit, dixit 14.04.2015 10:05:
> On Tue, Apr 14, 2015 at 12:16 AM, Sebastian Schuberth
> 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, suppo
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 i
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 f
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
201 - 300 of 825 matches
Mail list logo