I also re-read the whole document and think it's still up-to-date
with Git 2.0. But I might have missed some subtler points.
Thomas
- Original Nachricht
Von: Junio C Hamano
An: Thomas Ackermann
Datum: 11.11.2014 23:51
Betreff: Re: [PATCH] gittutorial.txt: remove reference
On Wed, Nov 12, 2014 at 2:57 AM, Eric Sunshine wrote:
> On Tue, Nov 11, 2014 at 7:40 PM, Johan Herland wrote:
>> + test_line_count = 1 actual
>
> Broken &&-chain. This problem is repeated each place use invoke
> test_line_count().
Thanks. Fixed in the next iteration.
...Johan
--
Johan H
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Am 12.11.2014 um 09:57 schrieb Thomas Ackermann:
>
> I also re-read the whole document and think it's still up-to-date
> with Git 2.0. But I might have missed some subtler points.
Hhmm..
At least this is not 100% up to date:
diff --git a/Documentat
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Am 12.11.2014 um 10:12 schrieb Stefan Näwe:
> Am 12.11.2014 um 09:57 schrieb Thomas Ackermann:
>
>> I also re-read the whole document and think it's still up-to-date
>> with Git 2.0. But I might have missed some subtler points.
>
> Hhmm..
> At least
Hi,
On Tue, 11 Nov 2014, Junio C Hamano wrote:
> Jeff King writes:
>
> > I don't think this is "unfortunately"; freeing the memory was the entire
> > purpose in adding env_array. If you want to easily reuse the same
> > environment in multiple commands, it is still perfectly fine to use
> > "en
On Wed, Nov 12, 2014 at 11:45:19AM +0100, Johannes Schindelin wrote:
> Okay, I have to say that I was led to believe that reusing the
> child_process struct is okay because argv_array_clear() explicitly
> reinitializes the env_array field, something that is useless churn unless
> you plan to reuse
On Wed, Nov 12, 2014 at 05:52:29AM -0500, Jeff King wrote:
> > However, my personal taste says that reusing the same memory is more
> > elegant than to waste extra memory unnecessarily, so I will go with the
> > child_process_init() solution.
>
> I do not mind much either way. But I doubt that a
Hi Junio,
On Mon, 10 Nov 2014, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> By the way, if the expected use case of updateInstead is what I
> >> outlined in the previous message, would it make more sense not to
> >> fail with "update-index --refresh" failure (i.e. the working tree
Hi Junio,
On Mon, 10 Nov 2014, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Dying when "update-index --refresh" signals a difference is an
> > attempt to mimic #1, but it is in line with the spirit of the reason
> > why a user would want to use updateInstead, I think. The situation
> >
Hi Junio,
On Mon, 10 Nov 2014, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> I do not think of a good justification of detachInstead offhand, but
> >> you must have thought things through a lot more than I did, so you
> >> can come up with a work flow description that is more usabl
Signed-off-by: Jens Stimpfle
---
Notes:
This patch makes sure that "sob", "cc" and "bodycc" values for
sendemail.suppresscc option are handled, even when the email-addresses in
question are equal to the sender and "self" in not configured in
sendemail.suppresscc.
Sounds c
On Tue, Nov 11, 2014 at 3:50 AM, Dominik Vogt wrote:
> Hi Jonas,
HI Dominik,
Good to hear from you.
> working on a relatively old machine with a crypted disk, there are
> really two performance problems with tig on large repos like gcc
> or the Linux kernel. I wonder what would be necessary to
On Wed, Nov 12, 2014 at 2:59 AM, Jeff King wrote:
>>
>> I do not mind much either way. But I doubt that a single extra struct on
>> the stack will break the bank, compared to the fact that we are forking
>> and execing a new program. I'd also not be surprised if a smart compiler
>> could notice th
Translate 62 new messages came from git.pot update in 16742b0
(l10n: git.pot: proposed updates for v2.2.0 (+62)).
Signed-off-by: Ralf Thielow
---
po/de.po | 180 +--
1 file changed, 83 insertions(+), 97 deletions(-)
diff --git a/po/de.
I have a case where I would like to smudge files according to the
reflog information of the switching-to branch.
This is difficult to achieve because updating HEAD to the new
switched-to refname or commit hash is the last step performed in a
checkout prior to calling the post-checkout hook, and sm
Johannes Schindelin writes:
> Hi Junio,
>
> On Mon, 10 Nov 2014, Junio C Hamano wrote:
>
>> Junio C Hamano writes:
>>
>> > Dying when "update-index --refresh" signals a difference is an
>> > attempt to mimic #1, but it is in line with the spirit of the reason
>> > why a user would want to use u
Johannes Schindelin writes:
> Okay, here is my explanation: at the time I wanted to disprove that
> updateInstead could make sense, I wanted to offer a milder version of
> updating the current branch that left the working directory alone:
> detachInstead.
>
> Now, I never used it myself, but I us
On 11/11/2014 11:56 PM, Jeff King wrote:
> [+cc git@vger, since this may be of interest to others]
>
> On Tue, Nov 11, 2014 at 02:40:59PM -0800, Scott Baker wrote:
>
> > I'd like to recreate the github style diffs on the command line. It
> > appears that your diff-highlight is very close. The curre
Jens Stimpfle writes:
> Signed-off-by: Jens Stimpfle
> ---
Thanks.
Please do better than saying "Fix" to explain your changes in your
log message.
Also, on the Subject:, s/Fix/fix/; s/option./option/ to match other
entries in "git shortlog" message.
"What you think is broken" is clear (i.e.
Derek Moore writes:
> I have a case where I would like to smudge files according to the
> reflog information of the switching-to branch.
Don't do that.
When you have branches A, B and C, and a path F is the same between
branches A and B but different in branch C, if you start from branch
C and
Hello, i have a patch here for the git docs.
There is a typo.
See: https://github.com/git/git/pull/103/files
cheers,
-
Joe DF--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo inf
Here's a solution that depends only/mostly on blob contents:
1) construct the ident of the blob via an `(echo -e -n "blob \0"
; cat file) | sha1sum` equivalent if an $Id$ string is not found in
its contents,
2) look up the earliest commit with that blob hash at that path, and
3) use the reflog m
On Wed, Nov 12, 2014 at 2:17 PM, Joe DF wrote:
> Hello, i have a patch here for the git docs.
> There is a typo.
> See: https://github.com/git/git/pull/103/files
> cheers,
Thanks. This is fixed already [1] in the git "master" branch.
[1]: http://thread.gmane.org/gmane.comp.version-control.git/25
On Wed, Nov 12, 2014 at 2:17 PM, Joe DF wrote:
> Hello, i have a patch here for the git docs.
> There is a typo.
> See: https://github.com/git/git/pull/103/files
> cheers,
> -
> Joe DF--
> To unsubscribe from this list: send the line "unsubscribe git" in
> the b
Am 09.11.2014 um 02:59 schrieb Jeff King:
> test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
> - test_when_finished "git branch -d a || git branch -d a/b" &&
> + test_when_finished "git branch -d one || git branch -d one/two" &&
>
> - git branch a/b master
> But if you then switch to B from that state, F will not even be
> modified (i.e. it will keep the contents you prepared for "branch
> A's instance of F").
Or: the post-commit hook used in the workaround looks up the prior
branch via @{-1}, finds all files common between @ & @{-1} that don't
shar
On 11.11.2014, at 23:51, Junio C Hamano wrote:
> Max Horn writes:
>
>> I did this because I was browsing the remote helper docs online quite a bit,
>> and was wishing for some more direct links between the pages. While I can
>> manyally edit the URL, it seems logical to offer these links direc
Derek Moore writes:
>> But if you then switch to B from that state, F will not even be
>> modified (i.e. it will keep the contents you prepared for "branch
>> A's instance of F").
>
> Or: the post-commit hook used in the workaround looks up the prior
> branch via @{-1}, finds all files common bet
Max Horn writes:
> On 11.11.2014, at 23:51, Junio C Hamano wrote:
> ...
>>> +linkgit:git-fast-import[1]
>>
>> This looks somewhat out of place; fast-import is not the only or
>> even the primary way to do a remote-helper, is it?
>
> It depends on how you look at it, I'd say. If you write a remo
Junio C Hamano writes:
> Max Horn writes:
>
>> On 11.11.2014, at 23:51, Junio C Hamano wrote:
>> ...
+linkgit:git-fast-import[1]
>>>
>>> This looks somewhat out of place; fast-import is not the only or
>>> even the primary way to do a remote-helper, is it?
>>
>> It depends on how you look
Johan Herland writes:
> On Wed, Nov 12, 2014 at 2:57 AM, Eric Sunshine
> wrote:
>> On Tue, Nov 11, 2014 at 7:40 PM, Johan Herland wrote:
>>> + test_line_count = 1 actual
>>
>> Broken &&-chain. This problem is repeated each place use invoke
>> test_line_count().
>
> Thanks. Fixed in the n
This is in pu, haven't checked if it's also in master, this is the
first time I've run this test
$ GIT_TEST_CLONE_2GB=t ./t5705-clone-2gb.sh -v
Initialized empty Git repository in
/Users/michael.blume/workspace/git/t/trash
directory.t5705-clone-2gb/.git/
expecting success:
git config pack.compres
On Wed, Nov 12, 2014 at 09:20:22PM +0100, Johannes Sixt wrote:
> Am 09.11.2014 um 02:59 schrieb Jeff King:
> > test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
> > - test_when_finished "git branch -d a || git branch -d a/b" &&
> > + test_when_finished "git branch -d
Confirmed exists on master
On Wed, Nov 12, 2014 at 1:57 PM, Michael Blume wrote:
> This is in pu, haven't checked if it's also in master, this is the
> first time I've run this test
>
> $ GIT_TEST_CLONE_2GB=t ./t5705-clone-2gb.sh -v
> Initialized empty Git repository in
> /Users/michael.blume/wor
Hi,
found a small code redundancy in a builtin command retrieval ('git.c').
For the "master" branch.
Thanks in advance for any suggestions.
Signed-off-by: slavomir vlcek
---
>From 78228e3f7c3029d07827f973fa7992777d6e0cb9 Mon Sep 17 00:00:00 2001
From: slavomir vlcek
Date: Wed, 12 Nov 2014 14:
>From lib_terminal.sh:
# Reading from the pty master seems to get stuck _sometimes_
# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
#
# Reproduction recipe: run
#
# i=0
# while ./test-terminal.perl echo hi $i
# do
# : $((i = $i + 1))
# done
#
# After 2000 iterations or so it hangs.
# https://rt.
Signed-off-by: Aleksey Vasenev
---
.../credential/wincred/git-credential-wincred.c| 25 +++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/contrib/credential/wincred/git-credential-wincred.c
b/contrib/credential/wincred/git-credential-wincred.c
index a1d38f
On Wed, Nov 12, 2014 at 10:18 PM, Junio C Hamano wrote:
> Johan Herland writes:
>> On Wed, Nov 12, 2014 at 2:57 AM, Eric Sunshine
>> wrote:
>>> On Tue, Nov 11, 2014 at 7:40 PM, Johan Herland wrote:
+ test_line_count = 1 actual
>>>
>>> Broken &&-chain. This problem is repeated each p
The 'SubmittingPatches' document contains a small inconsistency
in a patch-email sending procedure.
Not a big thing,
but a newcomer could get confused.
Please,
also consider adding the definition/explanation for all the branches available
at the beginning of this document (and maybe even what th
Hi all,
Apologies if this has already been raised or PEBCAK, but I've noticed
a bug where git log with certain date ranges breaks things. It appears
to be any --since date with a --until date in the future between
2014-12-01 and 2014-12-09. Dates from 2014-12-10 appear to work, and
so does the dat
The request is to allow git to set the file modification time on
checkout to the commit-author-date of the commit which last modified the
file.
Yes I know this is in the FAQ, but the FAQ entry is missing an
increasingly common use case: docker.
When docker builds an image, it generates layers of im
On 2014-11-13 05.45, Patrick Hemmer wrote:
> The request is to allow git to set the file modification time on
> checkout to the commit-author-date of the commit which last modified the
> file.
> Yes I know this is in the FAQ, but the FAQ entry is missing an
> increasingly common use case: docker.
>
On 2014-11-12 22.57, Michael Blume wrote:
[t5705-clone-2gb.sh broken on Mac OS]
It is most probably even broken on every platform,
since we renovated the URL parser in 2013.
(More info can be found here:)
git log t/t5601-clone.sh
I missed t5705-clone-2gb.sh,
because it has its own enabler vari
On 2014-11-11 13.49, Duy Nguyen wrote:
> I've come to the last piece to speed up "git status", watchman
> support. And I realized it's not as good as I thought.
>
> Watchman could be used for two things: to avoid refreshing the index,
> and to avoid searching for ignored files. The first one can b
A URL like file;//. is (no longer) supported by Git:
Typically there is no host, and RFC1738 says that file:///
should be used.
Update t5705 to use a working URL.
Reported-by: Michael Blume
Signed-off-by: Torsten Bögershausen
---
t/t5705-clone-2gb.sh | 2 +-
1 file changed, 1 insertion(+), 1 d
45 matches
Mail list logo