Hi,
Git Rev News edition 2 is now available:
https://git.github.io/rev_news/2015/04/05/edition-2/
Thanks a lot to all the helpers!
Enjoy,
Christian, Thomas and Nicola.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More ma
Linus Torvalds writes:
> I just noticed this because I had amended some merge commits with
>
>git commit --amend --date=now
>
> to update them, and that gets some funny broken timezones. I suspect
> it's some silly daylight savings time issue.
>
> Lookie here, I can reproduce it trivially wit
I just noticed this because I had amended some merge commits with
git commit --amend --date=now
to update them, and that gets some funny broken timezones. I suspect
it's some silly daylight savings time issue.
Lookie here, I can reproduce it trivially with current git (in the git
repo itself)
>From 9cc607667a20317c837afd90d50c078da659b72f Mon Sep 17 00:00:00 2001
From: Lex Spoon
Date: Sat, 11 Apr 2015 10:01:15 -0400
Subject: [PATCH] git-p4: Use -m when running p4 changes
Signed-off-by: Lex Spoon
---
Updated to include a test case
git-p4.py | 51 +++
On Sat, Apr 11, 2015 at 12:43 PM, Erik Elfström wrote:
> v1 of the patch can be found here:
> http://thread.gmane.org/gmane.comp.version-control.git/266839/focus=266839
>
> changes in v2:
> * fixed commit message,
> "p7300: added performance tests for clean"
> change to:
> "p7300: add perfor
Resort furniture, we will provide a solution for your furniture resort.
please see and select resort furniture you need at http://www.horestco.com.
because we specialize in indoor and outdoor wood furniture, stainless steel
furniture, custom made furniture, teak furniture and wicker furniture
natur
> I do not offhand know (I am on a bus with terrible connection so I
> won't bother checking the source now) if we send "this ref has to
> point at that object" even for STATUS_UPTODATE cases, to cause your
> remote to trigger the receive hook in the frist place, but if that
> is the case, then the
On Tue, Apr 14, 2015 at 12:30:23PM -0700, Junio C Hamano wrote:
> > If I recall correctly, Scott said onstage that some/all of the
> > conference proceeds would be going directly into this fund. So this
> > might need to be revised upward by 50-100% sometime soon :)
>
> I think you misheard it.
"Chris O'Kelly" writes:
[administrivia: people read from top to bottom; please do not top
post]
> On Wed, Apr 15, 2015 at 1:08 AM, Junio C Hamano wrote:
>> "Chris O'Kelly" writes:
>>
>>> A brief background of my use case:
>>> I am wanting to write a pre-push hook to prevent tags being pushed t
Stefan Beller writes:
> The 'lock_fd' is the same as 'lk->fd'. No need to store it twice so remove
> it. You may argue this introduces more coupling as we need to know more
> about the internals of the lock file mechanism, but this will be solved in
> a later patch.
>
> No functional changes inte
I need to learn to read the whole sentence. :(
Apologies.
On Tue, Apr 14, 2015 at 3:30 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> On Tue, Apr 14, 2015 at 1:39 PM, Junio C Hamano wrote:
>>
>>> It is OK to omit the name in the extern declaration here.
>>
>> It is OK, but I think this
Stefan Beller writes:
> On Tue, Apr 14, 2015 at 1:39 PM, Junio C Hamano wrote:
>
>> It is OK to omit the name in the extern declaration here.
>
> It is OK, but I think this is bad practice.
Take a special note on the word "here", meaning "in this particular
case." It is perfectly fine when the
Unfortunately in this case we don't have control over the hooks at the
receiving end - we want to prevent tags from being pushed by all users
to these repo's.
On Wed, Apr 15, 2015 at 1:08 AM, Junio C Hamano wrote:
> "Chris O'Kelly" writes:
>
>> A brief background of my use case:
>> I am wanting
On Tue, Apr 14, 2015 at 1:39 PM, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
>>> diff --git a/cache.h b/cache.h
>>> index 3d3244b..7f9bab0 100644
>>> --- a/cache.h
>>> +++ b/cache.h
>>> @@ -836,6 +836,13 @@ char *strip_path_suffix(const char *path, const
>>> char *suffix);
>>> int daem
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
t/t1400-update-ref.sh | 28
1 file changed, 28 insertions(+)
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 7b4707b..47d2fe9 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.
The 'lock_fd' is the same as 'lk->fd'. No need to store it twice so remove
it. You may argue this introduces more coupling as we need to know more
about the internals of the lock file mechanism, but this will be solved in
a later patch.
No functional changes intended.
Signed-off-by: Stefan Beller
During creation of the patch series our discussion we could have a
more descriptive name for the prerequisite for the test so it stays
unique when other limits of ulimit are introduced.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
t/t7004-tag.sh | 4 ++--
1 file changed, 2 ins
On Git Merge Wilhelm Bierbaum from Twitter made clear that we'd have problems
with large transactions in git. As I have been working on that series a few
months ago and it still bugs me, I thought about reviving the series.
However the series got stale a few months ago because we were not sure how
A release candidate Git v2.4.0-rc2 is now available for testing at
the usual places. The difference since -rc1 is mostly l10n and a
handful of documentation clean-ups.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The second release candidate 2.4-rc2 has been tagged. There were a
few more topics I felt are safe to merge, but they had updates to
translatab
On Tue, Apr 14, 2015 at 2:17 PM, Christian Couder
wrote:
> On Sat, Apr 11, 2015 at 12:31 PM, Paul Mackerras wrote:
>> However, I agree gitk should refresh the notes in updatecommits as
>> well, but that will take more work. Is git notes list the best way to
>> find out all the current notes?
Ye
On Tue, Apr 14, 2015 at 7:32 AM, Matthieu Moy wrote:
> Signed-off-by: Matthieu Moy
> ---
> diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
> index 0f8f47f..6f053ff 100755
> --- a/t/t3904-stash-patch.sh
> +++ b/t/t3904-stash-patch.sh
> @@ -81,4 +81,30 @@ test_expect_success 'none of t
On Tue, Apr 14, 2015 at 7:32 AM, Matthieu Moy wrote:
> The test passes if one replaces the 'e' command with a 'y' command in
> the 'add -p' session.
>
> Reported-by: Tanky Woo
> Signed-off-by: Matthieu Moy
> ---
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> index 24ddd
Johannes Schindelin writes:
>> diff --git a/cache.h b/cache.h
>> index 3d3244b..7f9bab0 100644
>> --- a/cache.h
>> +++ b/cache.h
>> @@ -836,6 +836,13 @@ char *strip_path_suffix(const char *path, const
>> char *suffix);
>> int daemon_avoid_alias(const char *path);
>> extern int is_ntfs_dotgit(co
(resending with accidental HTML removed)
Great, I'm glad it looks like a good approach!
I'll add a test case for it and to support the test case, an
option for the block size. I guess the block-size option will go on
"sync", "clone", and "fetch". Alternatively, maybe someone has a
better sug
Dave Borowitz writes:
> On Mon, Apr 13, 2015 at 7:56 AM, Jeff King wrote:
>> # Money: How much do we have?
>>
>> - $19,059.25 (USD)
>>
>> // Disclaimer: this is not necessarily up-to-the-minute, as
>> // SFC's reports to us sometimes lag a bit. And also because
>> // I am fairly inexperienced u
On Mon, Apr 13, 2015 at 7:56 AM, Jeff King wrote:
> # Money: How much do we have?
>
> - $19,059.25 (USD)
>
> // Disclaimer: this is not necessarily up-to-the-minute, as
> // SFC's reports to us sometimes lag a bit. And also because
> // I am fairly inexperienced using the `ledger` program, so
> /
I'm having a hard time understanding why ``git stash save" chokes on a
submodule removal when an empty directory is present at the removed
submodule's path. If the submodule is staged for deletion, why not
just leave the empty directory alone?
The following Gist illustrates the situation I am enco
Matthieu Moy writes:
> Playing a bit with add -p and stash -p, I can confirm the bug reported
> by Tanky. This series just adds failing tests, but I couldn't debug it.
>
> I've exhausted my Git time budget for now, so if someone wants to take
> over and fix the bugs, feel free to do it!
I do not
Hi Jose,
On 14.04.2015, at 18:44, Jose de Leon wrote:
> Hi All,
>
>
> I've got an interesting problem and the possible solutions I've found from
> searching google don't seem to work for us. In a nutshell, I need to combine
> multiple git repositories into single repository and preserve all
Thank you!
-Original Message-
From: Max Horn [mailto:m...@quendi.de]
Sent: Tuesday, April 14, 2015 10:15 AM
To: Jose de Leon
Cc: git@vger.kernel.org
Subject: Re: How to combine git repos with similar code and keep all branches
and tags?
Hi Jose,
On 14.04.2015, at 18:44, Jose de Leon w
Hi,
On Mon, Apr 13, 2015 at 05:50:49PM +0200, Johannes Schindelin wrote:
> maybe it would be a good idea to add a `0/7` mail that describes the
> overall goal of this patch series, much like a Pull Request? I found
> it very useful -- even for myself -- to set a description via `git
> branch --edi
Matthieu Moy writes:
> Jose de Leon writes:
>
>> For some unknown reason to me, our developers started a git project,
>> called Ver1, this was the first version. Then sometime later, they
>> created a new git repository called Ver2, the initial commit for Ver2
>> was essentially a copy of the co
Matthew Rothenberg writes:
> - what is the expected PATH modification behavior for subprocesses of
> git-hooks? Is this documented anywhere?
> - what would be causing /usr/local/bin to be prepended here, and can
> it be adjusted via preference?
This is not limited to hooks and very much delibe
乙酸鋰 writes:
> Hi,
>
> In git < 2.0, git commit --amend --date="" can amend commit with
> current time as author time.
> But since git 2.0, this does not work, dying with "invalid date format".
> I have to instead type git commit --amend --date="now".
> Is empty string date format no longer suppor
Jose de Leon writes:
> For some unknown reason to me, our developers started a git project,
> called Ver1, this was the first version. Then sometime later, they
> created a new git repository called Ver2, the initial commit for Ver2
> was essentially a copy of the code in Ver1 from the master. Th
Hi,
Like the years before, I'm going to offer my students a 1 month project
(mid May -> mid June) where they can contribute to a free software, in
particular Git. Last year we got no student, but in the past we got
interesting features merged in (e.g. "git blame" with textconv, hints in
"git statu
Hi All,
I've got an interesting problem and the possible solutions I've found from
searching google don't seem to work for us. In a nutshell, I need to combine
multiple git repositories into single repository and preserve all history,
branches and tags from each repository.
Does anybody
Jeff King writes:
> On Mon, Apr 13, 2015 at 10:50:55PM +0200, Matthieu Moy wrote:
>
>> My second guess is that they represent directories.
>> But even then, I can't find which of the tee-shirt's circles represents
>> which directory, and the count doesn't match.
>>
>> Does anybody have a better
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 above, "A^ dangles from A loosely" because it
>>> hangs from A (you can
Using git 2.3.5 (on darwin, installed via homebrew), when executing a
script via the commit-msg githook, the following gets *prepended* to
the $PATH for the subprocess:
/usr/local/Cellar/git/2.3.5/libexec/git-core:/usr/local/Cellar/git/2.3.5/libexec/git-core:/usr/local/bin:{rest
of path...}
I
On Tue, 14 Apr 2015, Luke Mewburn wrote:
> Updated patch where is_foreground_fd() is only called in display()
> just before the output is to be displayed.
Acked-by: Nicolas Pitre
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.ker
"Chris O'Kelly" writes:
> A brief background of my use case:
> I am wanting to write a pre-push hook to prevent tags being pushed to
> our production servers. The production servers in our case are --bare
> endpoints, and when we push a tag at them, they always checkout the
> commit that tag is a
On Tue, Apr 14, 2015 at 10:52 AM, Sebastian Schuberth
wrote:
>> A dangling object is an unreachable object that cannot be
>> made reachable by any way other than pointing at it
>> directly with a ref.
>
> Thanks a lot for the prompt explanation!
Note to myself: I just realized that both "danglin
Tanky Woo writes:
> Stash this hunk [y,n,q,a,d,/,j,J,g,e,?]? y
> @@ -2,3 +3,4 @@
> bbb
> +added line 2
> ccc
> ddd
> Stash this hunk [y,n,q,a,d,/,K,g,e,?]? y
My version does n, y, not y, y. The problem is the mix of stashed/not
stashed hunks. See my other message for a reproducible test, it d
On Sat, Apr 11, 2015 at 12:31 PM, Paul Mackerras wrote:
> On Wed, Apr 08, 2015 at 01:51:40PM +0200, Michael J Gruber wrote:
>> 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
---
MDaemon has detected restricted attachments within an email message
---
>From : git@vger.kernel.org
To: zafarzoba...@mega-in.com
Subject : Report
Messa
On Mon, Apr 13, 2015 at 11:10 PM, Jonathan Nieder wrote:
> Hi,
>
> Thomas Ferris Nicolaisen wrote:
>
>> Perhaps someone here would prefer to use my gist when
>> redirecting people with "user questions" away from this list, or
>> inspire them to write better bug reports.
>
> This won't
The test passes if one replaces the 'e' command with a 'y' command in
the 'add -p' session.
Reported-by: Tanky Woo
Signed-off-by: Matthieu Moy
---
t/t3701-add-interactive.sh | 25 +
1 file changed, 25 insertions(+)
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-i
Signed-off-by: Matthieu Moy
---
t/t3904-stash-patch.sh | 26 ++
1 file changed, 26 insertions(+)
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index 0f8f47f..6f053ff 100755
--- a/t/t3904-stash-patch.sh
+++ b/t/t3904-stash-patch.sh
@@ -81,4 +81,30 @@ test_ex
Playing a bit with add -p and stash -p, I can confirm the bug reported
by Tanky. This series just adds failing tests, but I couldn't debug it.
I've exhausted my Git time budget for now, so if someone wants to take
over and fix the bugs, feel free to do it!
Matthieu Moy (4):
add -p: demonstrate
The old description is rather clearly a wrong cut-and-paste from
t2016-checkout-patch.sh.
Signed-off-by: Matthieu Moy
---
t/t3904-stash-patch.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index 70655c1..9a59683 100755
--- a
Signed-off-by: Matthieu Moy
---
t/t3904-stash-patch.sh | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index 9a59683..0f8f47f 100755
--- a/t/t3904-stash-patch.sh
+++ b/t/t3904-stash-patch.sh
@@ -3,7 +3,13 @@
On 11 April 2015 at 16:17, Lex Spoon wrote:
>
>
> Signed-off-by: Lex Spoon
> ---
> This patch addresses a problem I am running into with a client. I am
> attempting to mirror their Perforce repository into Git, and on certain
> branches their Perforce server is responding with an error about "too
On Mon, Apr 13, 2015 at 11:01:04AM -0400, Nicolas Pitre wrote:
| > That's what happens; the suppression only occurs if the process is
| > currently background. If I start a long-running operation (such as "git
| > fsck"), the progress is displayed. I then suspend & background, and the
| >
Updated patch where is_foreground_fd() is only called in display()
just before the output is to be displayed.
From d87997509fc631b8cdc7db63f289102d6ddfe933 Mon Sep 17 00:00:00 2001
From: Luke Mewburn
Date: Mon, 13 Apr 2015 23:30:51 +1000
Subject: [PATCH] progress: no progress in background
Disabl
Tanky Woo writes:
> - coverage erase
> +
> +covhtml:
> + make clean
> + nosetests
> + coverage html
> + cd ${HTMLCOV} && python -m SimpleHTTPServer
> So I use e to manually edit the hunk, I delete all the + lines, it seems:
I can reproduce on git.git's master. Actua
On Tue, Apr 14, 2015 at 11:22 AM, Junio C Hamano wrote:
> I just visualize commits to be ping-pong balls with strings between
> them, and then grab the root of the graph and lift the whole thing
> up, while tips of the branches and tags are anchored. Commit A will
> be dangling in the wind if yo
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 above, "A^ dangles from A loosely" because it
>> hangs from A (you can reach it from A) but loosely, because it would
>> "drop" if A ge
On Tue, Apr 14, 2015 at 10:50 AM, Michael J Gruber
wrote:
> "to dangle" means "to hang loosely".
>
> So, in the description above, "A^ dangles from A loosely" because it
> hangs from A (you can reach it from A) but loosely, because it would
> "drop" if A gets dropped and A is "likely" to be dropp
On Tue, Apr 14, 2015 at 10:05 AM, Junio C Hamano wrote:
> A dangling object is an unreachable object that cannot be
> made reachable by any way other than pointing at it
> directly with a ref.
Thanks a lot for the prompt explanation!
--
Sebastian Schuberth
--
To unsubscribe from this list: sen
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
Hi Brian,
On 2015-04-14 05:12, brian m. carlson wrote:
> On Mon, Apr 13, 2015 at 11:48:50PM +1000, Luke Mewburn wrote:
>
> I appreciated the opportunity to learn about tcgetpgrp(3). The Windows
> folks will probably need to stub that function out, but they're no worse
> off than they were before.
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, suppose I have a commit A that is the tip of exactly one
> branch (a
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, suppose I have a commit A that is the tip of exactly one
branch (and no tag or other ref points to A). If I delete that branch,
is A now dan
65 matches
Mail list logo
