Matthieu Moy matthieu@grenoble-inp.fr writes:
More precisely: you should have a look at git-multimail (in directory
contrib/, in branch for now pu/, or from
https://github.com/mhagger/git-multimail) before spending time on
post-receive-email.
Oh, by the way, is this a vote of confidence
Junio C Hamano gits...@pobox.com writes:
For now, add core.checkstat, and warn people who have core.statinfo
in their configuration file that we will remove it in Git 2.0.
And an obvious follow-up for the 2.0 looks like this.
-- 8 --
Subject: [PATCH] core.statinfo: remove as promised in Git
Thanks.
I queued this, and will push the result out on the side of 'pu'
closer to 'next'. Could you double check the conflict resolution?
I haven't got around to the peel-ref-cleanup yet.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
This early history on the attraction bracelet possesses manufactured an
enormous comeback while using the * thomas sabo charms
http://www.genuinethomassaboringsshop.co.uk/ * . No matter if you wish to
allow the item absent to be a memento, wear it for equipment or maybe treat
the item, this
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
As we already have merged enough changes to 'master' during this
cycle that can potentially cause unforseen regressions, let's not
merge topics
On Tue, May 7, 2013 at 1:47 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 05/07/2013 06:47 AM, Felipe Contreras wrote:
On Mon, May 6, 2013 at 10:27 PM, Michael Haggerty mhag...@alum.mit.edu
wrote:
You conjectured earlier that nobody uses blob marks, and I provided a
counterexample.
Michael Haggerty mhag...@alum.mit.edu writes:
CVS stores all of the revisions of a single file in a single filename,v
file in rcsfile(5) format. The revisions are stored as deltas ordered
so that a single revision can be reconstructed from a single serial read
of the file.
cvs2git reads
* pandora uk http://www.pandoracharmsvipsale.co.uk/ * produce a great
reward, any trend headline, plus a pleasurable for the vision inclusion in
your assortment. Pandora drops enjoy specific activities and also situations
simply by developing any Pandora diamond jewelry drops. They will can be
On 05/07/2013 09:12 AM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
CVS stores all of the revisions of a single file in a single filename,v
file in rcsfile(5) format. The revisions are stored as deltas ordered
so that a single revision can be reconstructed from a
On 05/07/2013 08:36 AM, Junio C Hamano wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
More precisely: you should have a look at git-multimail (in directory
contrib/, in branch for now pu/, or from
https://github.com/mhagger/git-multimail) before spending time on
Junio C Hamano gits...@pobox.com writes:
Matthieu Moy matthieu@grenoble-inp.fr writes:
More precisely: you should have a look at git-multimail (in directory
contrib/, in branch for now pu/, or from
https://github.com/mhagger/git-multimail) before spending time on
post-receive-email.
On 07/05/13 07:16, Jens Lehmann wrote:
Am 06.05.2013 02:19, schrieb Chris Packham:
This did get me thinking. Why does an uninitialized submodule need to
have an empty directory? If it didn't the maintainer in question
probably would have realized that he needed to run git submodule
update
On 05/07/2013 06:44 AM, Jeff King wrote:
On Tue, May 07, 2013 at 06:32:12AM +0200, Michael Haggerty wrote:
Another potential problem caused by the non-atomicity of loose reference
reading could be to confuse reachability tests if process 1 is reading
loose references while process 2 is
On Mon, May 06, 2013 at 10:31:10PM -0700, Junio C Hamano wrote:
c08e4d5b5cfa (Enable minimal stat checking, 2013-01-22) advertised
the configuration variable core.checkstat in the documentation and
its log message, but the code expected core.statinfo instead.
For now, add core.checkstat,
On Mon, May 06, 2013 at 11:40:47PM -0700, Junio C Hamano wrote:
I queued this, and will push the result out on the side of 'pu'
closer to 'next'. Could you double check the conflict resolution?
I eyeballed the --cc output, as well as the resulting file, and it
looks fine to me.
I haven't got
On 2013-05-04 01.14, Junio C Hamano wrote:
Cygwin portability; both were reviewed by Jonathan, and the tip one
seems to want a bit further explanation. Needs positive report
from Cygwin 1.7 users who have been on 1.7 to make sure it does not
regress for them.
I was trying to verify
On Sat, May 4, 2013 at 2:51 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Another trick is to use git push:
git push . $production_sha1:refs/heads/master
Great trick -- thanks! In use in ppg now :-)
m
--
martin.langh...@gmail.com
- ask interesting questions
- don't get distracted
On Mon, May 6, 2013 at 11:53 AM, John Keeping j...@keeping.me.uk wrote:
I'm not sure I fully understand what the reports are, but it sounds like
they are closely related to original configuration commits. If that is
the case, have you considered using Git notes instead of a separate
Felipe Contreras felipe.contre...@gmail.com writes:
It's wrong to call get_sha1() if they should be SHA-1s, plus
inefficient.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
It appears that they should be SHA-1s assumption does not hold;
this patch breaks at least 3303, 9020,
Matthieu Moy matthieu@grenoble-inp.fr writes:
OTOH, it's not urgent, people can already use git-multimail by taking it
from GitHub.
Yes. There are less and less reason to rush things into contrib/
these days, which is a very good thing from ecosystem's point of
view. It is a sign that
On 06/05/2013 23:45, Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
+struct treesame_state {
+ unsigned int nparents;
+ unsigned char treesame[FLEX_ARRAY];
+};
I have been wondering if we want to do one-bit (not one-byte) per
parent but no biggie ;-)
I did start down
Michael Haggerty mhag...@alum.mit.edu writes:
My understanding is that we are waiting on two things:
1. Consensus from the community. I would characterize the feedback on
the mailing list as limited in quantity but strongly positive [1-4] and
I think that most/all of the wishes for
Kevin Bracey ke...@bracey.fi writes:
On 06/05/2013 23:45, Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
+struct treesame_state {
+ unsigned int nparents;
+ unsigned char treesame[FLEX_ARRAY];
+};
I have been wondering if we want to do one-bit (not one-byte) per
parent
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 67869b4..0629149 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -280,4 +280,9 @@ test_expect_success 'clone checking out a tag' '
test_cmp fetch.expected fetch.actual
'
Junio C Hamano gits...@pobox.com writes:
I have a mildly strong suspicion that a better approach might be to:
- Copy the current stable snapshot to the contrib/ area, [...]
- Keep the development at your GitHub repository, [...]
- Update what is in contrib/ in my tree with a stable
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
index-pack --strict looks up and follows parent commits. If shallow
information is not ready by the time index-pack is run, index-pack may
be lead to non-existent objects. Make fetch-pack save shallow file to
disk before invoking index-pack.
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
That's an important feature for safety. When a script has created an
object or learned about it some other way, as long as it doesn't
abbreviate its name it can be sure that git commands will not
misunderstand it.
So I think this
Kevin Bracey ke...@bracey.fi writes:
On 06/05/2013 23:36, Junio C Hamano wrote:
Kevin Bracey ke...@bracey.fi writes:
+#,---E--. *H--. * marks !TREESAME parent
paths
+# /\ / \*
+# *A--*B---D--*F-*G-K-*L-*M
+# \ /*
On Tue, May 07, 2013 at 08:34:51AM -0700, Junio C Hamano wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 67869b4..0629149 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -280,4 +280,9 @@ test_expect_success 'clone
I just did git rebase origin/master for the umpteenth time, which
reminded me this nice patch is still pending.
ping?
m
On Thu, Jun 14, 2012 at 2:34 PM, Zbigniew Jędrzejewski-Szmek
zbys...@in.waw.pl wrote:
From: Martin Langhoff mar...@laptop.org
git log -G'regex' is a very usable
While learning about making a documentation patch, I noticed that
Documentation/CodingGuideles isn't as clear as it could be regarding
how to edit the documentation. In particular, it says Most (if not
all) of the documentation pages are written in AsciiDoc - and
processed into HTML output and
wor...@ariadne.com (Dale R. Worley) writes:
It's also a test for submitting a patch.
Then, the next step is to read SubmittingPatches (the part about how to
format your email and the role of the ---, and the part about
signed-off-by) ;-).
Welcome aboard!
--
Matthieu Moy
On Mon, May 06, 2013 at 07:02:41AM -0700, Junio C Hamano wrote:
Would it make sense for the server to send an ERR packet to give
a more helpful diagnosis?
I think git-daemon does so (or at least attempts to do so);
path_ok() uses enter_repo() to check if the given path is a
On Mon, May 6, 2013 at 7:52 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
... there is AFAICS _no_ way for sscanf() - having
already done one or more format extractions - to indicate to its caller
that the input fails to match the trailing part of the
These tests verify the correct behavior of git rev-parse --abbrev-ref
in both strict and loose modes. Really, it tests the correct behavior
of refs.c:shorten_unambiguous_ref() with its 'strict' argument set to
either true of false.
Signed-off-by: Johan Herland jo...@herland.net
---
There is currently a bug in refs.c:shorten_unambiguous_ref() that causes
refs/remotes/origin/HEAD to be shortened to origin/HEAD instead of
origin (which is expected from matching against the refs/remotes/%.*s
pattern from refs.c:ref_rev_parse_rules).
Signed-off-by: Johan Herland
When expanding shorthand refs to full ref names (e.g. in dwim_ref()),
we use the ref_rev_parse_rules list of expansion patterns. This list
allows origin to be expanded into refs/remotes/origin/HEAD, by
using the refs/remotes/%.*s/HEAD pattern from that list.
shorten_unambiguous_ref() exists to
On Tue, May 7, 2013 at 12:17 PM, Martin Langhoff
martin.langh...@gmail.com wrote:
I just did git rebase origin/master for the umpteenth time, which
reminded me this nice patch is still pending.
ping?
For some reason getting patches into gitk takes a long long looong time.
--
Felipe
On Tue, May 7, 2013 at 1:59 AM, Junio C Hamano gits...@pobox.com wrote:
* fc/at-head (2013-05-02) 5 commits
- Add new @ shortcut for HEAD
- sha1_name: refactor reinterpret()
- sha1_name: compare variable with constant, not constant with variable
- sha1_name: remove unnecessary braces
-
This looks ok with me, though I can manage without backward compatibility.
-- robin
--
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
Junio C Hamano gits...@pobox.com wrote:
Dimitar Bonev dsbo...@gmail.com writes:
[administrivia: please do not drop people out of Cc list]
That invites another question: if it is very well related, why isn't
it an option to start from the state you have in the working tree
(i.e. doing
Johan Herland jo...@herland.net writes:
New version coming up. I'm going to rip this patch out of the
surrounding series, since it doesn't really belong there anyway.
Thanks; will queue.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Johan Herland jo...@herland.net writes:
On Mon, May 6, 2013 at 7:52 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
... there is AFAICS _no_ way for sscanf() - having
already done one or more format extractions - to indicate to its caller
that the input
On Tue, May 7, 2013 at 3:29 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
+test_expect_success 'work-around clone with namespaced remote refs' '
+ rm -rf client
+ git init client
+ (
+ cd client
+ git remote add
Hi,
While trying to add support for the @ shortcut lots of cleanups arised. Here
they are in a single series.
Felipe Contreras (7):
tests: at-combinations: simplify setup
tests: at-combinations: check ref names directly
tests: at-combinations: improve nonsense()
sha1_name: remove no-op
The test is setting up an upstream branch, but there's a much simpler
way of doing that: git branch -u.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t1508-at-combinations.sh | 6 ++
1 file changed, 2 insertions(+), 4
Some committishes might point to the same commit, but through a
different ref, that's why it's better to check directly for the ref,
rather than the commit message.
We can do that by calling rev-parse --symbolic-full-name, and to
differentiate the old from the new behavior we add an extra
In some circumstances 'git log' might fail, but not because the @
parsing failed. For example: 'git rev-parse' might succeed and return a
bad object, and then 'git log' would fail.
The layer we want to test is revision parsing, so let's test that
directly.
Signed-off-by: Ramkumar Ramachandra
From: Ramkumar Ramachandra artag...@gmail.com
Add more tests exercising documented functionality.
[fc: commit message and extra tests]
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t1508-at-combinations.sh | 8
From: Ramkumar Ramachandra artag...@gmail.com
All the tests so far check that @{N} is the same as HEAD@{N} (for
positive N). However, this is not always the case; write a couple of
tests for this.
[fc: simplify some wording]
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
Signed-off-by:
'at' is always 0, since we can reach this point only if
!len reflog_len, and len=at when reflog is assigned.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sha1_name.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sha1_name.c b/sha1_name.c
index
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sha1_name.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 01e49a9..6530ddd 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -465,12 +465,11 @@ static int get_sha1_basic(const
From: Ramkumar Ramachandra artag...@gmail.com
The @-parsing loop unnecessarily checks for the sequence @{ from len -
2 unnecessarily. We can safely check from len - 4.
[fc: remove cruft]
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sha1_name.c | 2 +-
1 file changed, 1
Through the years the functionality to handle @{-N} and @{u} has moved
around the code, and as a result, code that once made sense, doesn't any
more.
There is no need to call this function recursively with the branch of
@{-N} substituted because dwim_{ref,log} already replaces it.
However,
From: Ramkumar Ramachandra artag...@gmail.com
It's trivial to check for them in the @{N} parsing loop.
[fc: style]
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sha1_name.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
Speak in reverse we shall not; compare variable with constant, not
constant with variable.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sha1_name.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 6530ddd..93c4e8c 100644
On Tue, May 7, 2013 at 11:31 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
On Mon, May 6, 2013 at 7:52 PM, Junio C Hamano gits...@pobox.com wrote:
It is interesting that this bug has stayed so long with us, which
may indicate that nobody actually uses the
Hi,
Same patches as before, except that the cleanup ones are in a different series,
and this one doesn't depend on the other one.
Felipe Contreras (2):
sha1_name: refactor reinterpret()
Add new @ shortcut for HEAD
Documentation/git-check-ref-format.txt | 2 ++
Documentation/revisions.txt
This code essentially replaces part of ref with another ref, for example
'@{-1}@{u}' is replaced with 'master@{u}', but this can be reused for
other purposes other than nth prior checkouts.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
sha1_name.c | 42
Typing 'HEAD' is tedious, especially when we can use '@' instead.
The reason for choosing '@' is that it follows naturally from the
ref@op syntax (e.g. HEAD@{u}), except we have no ref, and no
operation, and when we don't have those, it makes sens to assume
'HEAD'.
So now we can use 'git show
Johan Herland jo...@herland.net writes:
...oops, I see I forgot the trailing on this line. Do you want a
resend, or fix up yourself?
I've pushed out a heavily fixed-up version on 'pu', mostly for
styles and some log message changes to describe when it is not a
symref.
--
To unsubscribe from
On Tue, May 7, 2013 at 4:55 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
While trying to add support for the @ shortcut lots of cleanups arised. Here
they are in a single series.
Felipe Contreras (7):
tests: at-combinations: simplify setup
tests: at-combinations: check ref
On Tue, May 7, 2013 at 9:38 AM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
It's wrong to call get_sha1() if they should be SHA-1s, plus
inefficient.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
It appears that they should
Johan Herland jo...@herland.net writes:
That said, I could have a go at using refs/peers/* instead of
refs/remotes/*, and see how that works out.
Hmm, I had refs/track/ in mind. Perhaps peers may work as well.
If it sticks, how pervasive do we want this renaming to be? I guess we
don't
I reset all the files to be lf. I also forced all the windows users
IDEs to use Unix endings. I haven't seen that error since then
Thanks for the assistance
On Thu, Apr 18, 2013 at 7:43 PM, Pete Wyckoff p...@padd.com wrote:
christopher.yee...@gmail.com wrote on Thu, 18 Apr 2013 11:24 -0500:
On Wed, May 8, 2013 at 12:06 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
...oops, I see I forgot the trailing on this line. Do you want a
resend, or fix up yourself?
I've pushed out a heavily fixed-up version on 'pu', mostly for
styles and some log
Hello,
I have a setup where I have a remote non-bare repo cloned from a
perforce workspace. It is used as a remote repo that people clone into
their own user repos, make commits to, then push back into the remote
repo. Then I periodically run the following commands in a script to
push those
Felipe Contreras felipe.contre...@gmail.com writes:
Turns out most of the get_sha1() calls were correct; this does the trick:
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 18fdfb3..d1d68e9 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -623,7 +623,7 @@
It's possible that the previous tip goes away, we should not assume it's
always present. Fortunately we are only using it to calculate the
progress to display to the user, so only that needs to be fixed.
Also, add a test that triggers this issue.
Signed-off-by: Felipe Contreras
On Tue, May 7, 2013 at 6:39 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
+ (cd gitrepo
+ git fetch
+ git log --format=%an %ad %s --date=short origin/master ../actual)
+
+ test_cmp actual expected
Hmm:
test_cmp expected actual
--
Felipe Contreras
--
To unsubscribe from
The comment was copied from hg-fast-export, not used anymore.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-bzr | 1 -
contrib/remote-helpers/git-remote-hg | 1 -
2 files changed, 2 deletions(-)
diff --git
Hi Junio,
The following changes since commit 7e6a0cc47da79dd22c0338aee8750fda92ced5d9:
git-completion.bash: add remote.pushdefault to config list
(2013-04-29 09:57:47 -0700)
are available in the git repository at:
git://github.com/git-l10n/git-po master
for you to fetch changes up to
2013/5/7 Junio C Hamano gits...@pobox.com:
What is this message trying to achieve? self review???
A bit puzzled
Maybe I should send a new rerolled patch series after this. Yesterday I
wanted to wait for a while to see suggestions and reviews from others.
--
Jiang Xin
--
To unsubscribe
On 05/07/2013 10:27 AM, Torsten Bögershausen wrote:
On 2013-05-04 01.14, Junio C Hamano wrote:
Cygwin portability; both were reviewed by Jonathan, and the tip one
seems to want a bit further explanation. Needs positive report
from Cygwin 1.7 users who have been on 1.7 to make sure it
Jiang Xin worldhello@gmail.com writes:
Hi Junio,
The following changes since commit 7e6a0cc47da79dd22c0338aee8750fda92ced5d9:
git-completion.bash: add remote.pushdefault to config list
(2013-04-29 09:57:47 -0700)
are available in the git repository at:
I have been building some automated patching scripts to update
multiple servers at once from our dev host. In doing so I ran into
some oddities with linux command line GIT version 1.8.0-rc0, so a
couple minor revisions behind.
First, a git pull puts the list of branches updated onto stderr.
Felipe Contreras felipe.contre...@gmail.com writes:
On Tue, May 7, 2013 at 6:39 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
+ (cd gitrepo
+ git fetch
+ git log --format=%an %ad %s --date=short origin/master ../actual)
+
+ test_cmp actual expected
Hmm:
test_cmp
On 08/05/13 00:12, Christopher Yee Mon wrote:
Hello,
I have a setup where I have a remote non-bare repo cloned from a
perforce workspace. It is used as a remote repo that people clone into
their own user repos, make commits to, then push back into the remote
repo.
Why is your p4 clone non-bare?
Felipe Contreras felipe.contre...@gmail.com writes:
The comment was copied from hg-fast-export, not used anymore.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-bzr | 1 -
contrib/remote-helpers/git-remote-hg | 1 -
2 files changed, 2
Felipe Contreras felipe.contre...@gmail.com writes:
Some committishes might point to the same commit, but through a
different ref, that's why it's better to check directly for the ref,
rather than the commit message.
We can do that by calling rev-parse --symbolic-full-name, and to
Felipe Contreras felipe.contre...@gmail.com writes:
In some circumstances 'git log' might fail, but not because the @
parsing failed. For example: 'git rev-parse' might succeed and return a
bad object, and then 'git log' would fail.
The layer we want to test is revision parsing, so let's
Felipe Contreras felipe.contre...@gmail.com writes:
When merging this series to the @ shortcut one, there will be
conflicts, this is how I propose fixing them:
return len; /* syntax Ok, not enough switches */
- if (0 len len == namelen)
+ if (len 0 len ==
82 matches
Mail list logo
