Would that not give the impression of git sh-prompt being a core command? If
so, that would be poor, IMHO.
When I was investigating this last night, I expected to find it (git-prompt.sh)
in contrib, although that doesn't make an enormous amount of sense. Ideally,
the full path to wherever
On Wed, Oct 24, 2012 at 10:50 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
This works just fine. Go ahead, apply my patch, and run it, the second
branch gets updated.
Yes, but as you said:
That is already the case, my patch will cause this to generate the same
output:
% git
On Thu, Oct 25, 2012 at 8:07 AM, Sverre Rabbelier srabbel...@gmail.com wrote:
On Wed, Oct 24, 2012 at 10:50 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
This works just fine. Go ahead, apply my patch, and run it, the second
branch gets updated.
Yes, but as you said:
That is
On Thu, Oct 25, 2012 at 7:53 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Felipe Contreras wrote:
All right, so I run this and get this:
% git fast-export master..master
reset refs/heads/master
from 8c7a786b6c8eae8eac91083cdc9a6e337bc133b0
As an user of fast-export, what do I do with
Hi,
The organisation I am currently working for uses 'git'.
In order to manage all the software used in the organisation we have been
compiling a list of software that includes the software Vendor's name.
My colleague has listed the vendor of git as being the 'Software Freedom
Conservancy'.
On Wed, Oct 24, 2012 at 11:19 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Oh really? This is with your patches:
% git fast-export --{im,ex}port-marks=/tmp/marks foo1 ^foo2 foo3..foo3
reset refs/heads/foo1
from :21
reset refs/heads/foo3
from :21
reset refs/heads/foo3
from :21
Felipe Contreras wrote:
Show me a single remote helper that manually stores SHA-1's and I
might believe you, but I doubt that, marks are too convenient.
Oh dear lord. Why are you arguing? Explain how coming to a consensus
on this will help accomplish something useful, and then I can explain
Sverre Rabbelier wrote:
That's weird, we have this bit:
+ if (elem-whence != REV_CMD_REV elem-whence !=
REV_CMD_RIGHT)
+ continue;
If I understand correctly that should cause it to only output revs
(e.g. 'foo1') and the rhs side of a have..want spec.
If
On Thu, Oct 25, 2012 at 12:34 AM, Jonathan Nieder jrnie...@gmail.com wrote:
If I remember right, '^foo1' is (whence == REV_CMD_REV) with (flags ==
UNINTERESTING). That's why sequencer.c checks for unadorned revs like
this:
if (opts-revs-cmdline.nr == 1
Different installers put the git-prompt.sh shell library at different
places on the installed system, so there is no shared location users
can count on:
Fedora - /etc/profile.d/git-prompt.sh
Gentoo - /usr/share/bash-completion/git-prompt
Arch - /usr/share/git/git-prompt.sh
The __git_ps1
Sverre Rabbelier wrote:
I know there was a reason why using UNINTERESTING didn't work
(otherwise we could've used that to start with, instead of needing
Junio's whence solution). I think all refs ended up being marked as
UNINTERESTING or somesuch.
True. Is it be possible to check
On Mon, Oct 22, 2012 at 6:38 AM, Mat Arge argemat1...@gmail.com wrote:
Hy!
I would like to sign each commit with a X.509 certificate and a private key
stored on a PKCS#11 token. I assume that that should be possible somehow using
a hook which calls openssl. Does somebody know a working
On 10/25/2012 02:02 AM, Danny Yates wrote:
Would that not give the impression of git sh-prompt being a core
command?
No more than git-sh-setup, which already works like that. Unless
perhaps by “core” you mean “not contrib”.
(Now that I think of it, I saw a request from an Ubuntu PPA user
Anand Kumria venit, vidit, dixit 25.10.2012 02:58:
Ahh, unix time. Of course.
That's the only difference *at the time being*, but this is not
guaranteed. Really, as Brandon says: cat-file -p is pretty printing
for human readability (which could be improved), and cat-file type
is the raw format
On Wed, Oct 24, 2012 at 09:52:52PM -0700, sza...@google.com wrote:
Signed-off-by: Stefan Zager sza...@google.com
---
git-submodule.sh |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index ab6b110..dcceb43 100755
---
On Thu, Oct 25, 2012 at 01:04:11AM -0400, Geert Bosch wrote:
On Oct 24, 2012, at 23:54, Brian Gernhardt br...@gernhardtsoftware.com
wrote:
It works if I change \s to [[:space:]], but I don't know how portable that
is.
As \s is shorthand for the POSIX character class [:space:], I'd
On 10/25/2012 08:43 AM, PROHASKA, Thor wrote:
Hi,
The organisation I am currently working for uses 'git'.
In order to manage all the software used in the organisation we have
been compiling a list of software that includes the software Vendor's
name.
My colleague has listed the vendor
On Wed, Oct 24, 2012 at 11:08:26PM +0200, Krzysztof Mazur wrote:
ok, I'm sending a version that just adds quote_subject() without
changing any logic, so now we still have in first case:
/[^[:ascii:]]/
and in the latter case:
!is_rfc2047_quoted($subject) /^[:ascii:]]/
In the
On Wed, Oct 24, 2012 at 11:28:29PM +0200, Krzysztof Mazur wrote:
For raw subjects rfc2047 quoting is needed not only for non-ASCII characters,
but also for any possible rfc2047 in it.
[...]
- return ($s =~ /[^[:ascii:]]/);
+ return ($s =~ /[^[:ascii:]]/) || ($s =~ /=\?/);
Very nice
On Thu, Oct 25, 2012 at 10:52:44AM +0200, Andreas Ericsson wrote:
On 10/25/2012 08:43 AM, PROHASKA, Thor wrote:
Hi,
The organisation I am currently working for uses 'git'.
In order to manage all the software used in the organisation we have
been compiling a list of software that
On Wednesday 24. October 2012 11:46:15 Michael J Gruber wrote:
Mat Arge venit, vidit, dixit 22.10.2012 15:38:
Hy!
I would like to sign each commit with a X.509 certificate and a private
key
stored on a PKCS#11 token. I assume that that should be possible somehow
using a hook which
On Thursday 25. October 2012 01:02:33 Brandon Casey wrote:
On Mon, Oct 22, 2012 at 6:38 AM, Mat Arge argemat1...@gmail.com wrote:
Hy!
I would like to sign each commit with a X.509 certificate and a private
key
stored on a PKCS#11 token. I assume that that should be possible somehow
On Tue, Oct 23, 2012 at 04:02:54PM -0400, Phil Hord wrote:
Teach git-status to report the sequencer state in short form
using a new --sequencer (-S) switch. Output zero or more
simple state token strings indicating the deduced state of the
git sequencer.
Introduce a common function to
On Tue, Oct 23, 2012 at 04:39:56PM -0400, Phil Hord wrote:
git pull --rebase does some clever tricks to find the base
for $upstream , but it forgets that we may not have any
branch at all. When this happens, git merge-base reports its
usage help in the middle of an otherwise successful
On Tue, Oct 23, 2012 at 07:58:04PM +0200, Thomas Ackermann wrote:
- target html creates html for all files in Documentation/howto and
Documentation/technical
Thanks.
+TECH_DOCS = technical/index-format
+TECH_DOCS += technical/pack-format
+TECH_DOCS += technical/pack-heuristics
+TECH_DOCS
On Tue, Oct 23, 2012 at 09:24:51AM +0700, Nguyen Thai Ngoc Duy wrote:
These functions are called in sequencer.c, which is part of
libgit.a. This makes libgit.a potentially require builtin/merge.c for
external git commands.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
I made
On Tue, Oct 23, 2012 at 01:34:05PM +0200, Matthieu Moy wrote:
This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2
2010, Replace remote tracking with remote-tracking), but new
instances of remote tracking (without dash) were introduced in the
meantime.
Thanks. It seems like
On Mon, Oct 22, 2012 at 04:30:17PM +0200, Joachim Schmitz wrote:
+ # for 'make test'
+ # some test don't work with /bin/diff, some fail with /bin/tar
+ # some need bash, and some need ${prefix}/bin in PATH first
+ SHELL_PATH=${prefix}/bin/bash
+
On Thu, Oct 25, 2012 at 05:01:49AM -0400, Jeff King wrote:
- if ($broken_encoding{$t} !is_rfc2047_quoted($subject)
- ($subject =~ /[^[:ascii:]]/)) {
- $subject = quote_rfc2047($subject, $auto_8bit_encoding);
+ if ($broken_encoding{$t}
From: Jeff King [mailto:p...@peff.net]
Sent: Thursday, October 25, 2012 11:58 AM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fix 'make test' for HP NonStop
On Mon, Oct 22, 2012 at 04:30:17PM +0200, Joachim Schmitz wrote:
+ # for 'make test'
+ # some test
On Sun, Oct 21, 2012 at 10:34:10PM +0100, Philip Oakley wrote:
The expected use case of this is to write supporting explanation for
-the commit that does not belong to the commit log message proper
-when (or after) you create the commit, and include it in your patch
-submission. But if you
On Sun, Oct 21, 2012 at 10:34:08PM +0100, Philip Oakley wrote:
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 85651b5..d918c53 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1787,6 +1787,11 @@ $ git format-patch origin
On Sun, Oct 21, 2012 at 09:52:37PM +0100, Philip Oakley wrote:
Signed-off-by: Philip Oakley philipoak...@iee.org
Thanks, this makes sense.
+refs/replace/`obj-sha1`::
+ records the SHA1 of the object that replaces `obj-sha1`.
+ This is similar to info/grafts and is internally used
On Thu, Oct 25, 2012 at 12:21:44PM +0200, Joachim Schmitz wrote:
+ # for 'make test'
+ # some test don't work with /bin/diff, some fail with /bin/tar
+ # some need bash, and some need ${prefix}/bin in PATH first
+ SHELL_PATH=${prefix}/bin/bash
+ SANE_TOOL_PATH=${prefix}/bin
From: Jeff King [mailto:p...@peff.net]
Sent: Thursday, October 25, 2012 12:49 PM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fix 'make test' for HP NonStop
On Thu, Oct 25, 2012 at 12:21:44PM +0200, Joachim Schmitz wrote:
+ # for 'make test'
+ #
On Thu, Oct 25, 2012 at 12:51:59PM +0200, Joachim Schmitz wrote:
But then I would think using /usr/local would be the sane thing to put
there, if that is the closest to standard for your platform.
OK, yes, hardcoding /usr/local seems OK too.
Would I need to re-roll?
Please do.
-Peff
--
This fixes the vast majority of test failures on HP NonStop.
Signed-off-by: Joachim Schmitz j...@schmitz-digital.de
---
v2: hardcode /usr/local rather than using ${prefix}
Makefile | 9 +
1 file changed, 9 insertions(+)
diff --git a/Makefile b/Makefile
index f69979e..35380dd 100644
---
From: Jeff King [mailto:p...@peff.net]
Sent: Thursday, October 25, 2012 12:53 PM
To: Joachim Schmitz
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fix 'make test' for HP NonStop
On Thu, Oct 25, 2012 at 12:51:59PM +0200, Joachim Schmitz wrote:
But then I would think using /usr/local
On Thu, Oct 25, 2012 at 05:01:49AM -0400, Jeff King wrote:
Hmm. What is this patch on top of? It looks like it is on top of your
original patch, but when I tried it on top of that, it does not apply
either, and the index lines in the patch do not mention a sha1 that I do
not have.
Sorry,
On Thu, Oct 25, 2012 at 01:19:19PM +0200, Krzysztof Mazur wrote:
On Thu, Oct 25, 2012 at 06:08:54AM -0400, Jeff King wrote:
Ah, never mind. I missed your earlier use compose-encoding for
Subject. I've queued it and all of the follow-ons onto the
km/send-email-compose-encoding topic.
On Thu, Oct 25, 2012 at 06:08:54AM -0400, Jeff King wrote:
Ah, never mind. I missed your earlier use compose-encoding for
Subject. I've queued it and all of the follow-ons onto the
km/send-email-compose-encoding topic.
thanks, what about the problem with whitespaces in quote_subject patch?
On Thu, Oct 25, 2012 at 04:36:26AM -0400, Jeff King wrote:
On Wed, Oct 24, 2012 at 09:52:52PM -0700, sza...@google.com wrote:
diff --git a/git-submodule.sh b/git-submodule.sh
index ab6b110..dcceb43 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -270,7 +270,6 @@ cmd_add()
What's cooking in git.git (Oct 2012, #08; Thu, 25)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Now that 1.8.0 is out, I've graduated
On Thu, Oct 25, 2012 at 4:45 PM, Jeff King p...@peff.net wrote:
On Tue, Oct 23, 2012 at 09:24:51AM +0700, Nguyen Thai Ngoc Duy wrote:
These functions are called in sequencer.c, which is part of
libgit.a. This makes libgit.a potentially require builtin/merge.c for
external git commands.
On 25.10.12 10:41, Jeff King wrote:
On Thu, Oct 25, 2012 at 01:04:11AM -0400, Geert Bosch wrote:
On Oct 24, 2012, at 23:54, Brian Gernhardt br...@gernhardtsoftware.com
wrote:
It works if I change \s to [[:space:]], but I don't know how portable that
is.
As \s is shorthand for the POSIX
Not all sed versions understand \s as whitespace
Use tr to translate '\t' into ' ' before feeding the line into sed
Signed-off-by: Torsten Bögershausen tbo...@web.de
---
t/t9401-git-cvsserver-crlf.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
On Thu, Oct 25, 2012 at 9:50 AM, Sverre Rabbelier srabbel...@gmail.com wrote:
On Thu, Oct 25, 2012 at 12:48 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Sverre Rabbelier wrote:
I know there was a reason why using UNINTERESTING didn't work
(otherwise we could've used that to start with,
On Wed, Oct 24, 2012 at 05:51:06PM -0700, Jonathan Nieder wrote:
Hi,
In olden days the admin would copy contrib/completion/git-completion.sh
to
/etc/bash_completion.d/git
and mortals could source /etc/bash_completion or
/etc/bash_completion.d/git in their ~/.bashrc (possibly
Hi,
At work, we use a lot of submodules (several levels of submodules actually).
As we also work with development branches, we use scripts to resync the whole
checked-out tree (mainly in automated integration)
We recently run across an issue where a branch (dev) contained a submodule
while it
Jeff King wrote:
On Tue, Oct 23, 2012 at 04:02:54PM -0400, Phil Hord wrote:
Teach git-status to report the sequencer state in short form
using a new --sequencer (-S) switch. Output zero or more
simple state token strings indicating the deduced state of the
git sequencer.
Introduce a
SZEDER Gábor wrote:
On Wed, Oct 24, 2012 at 05:51:06PM -0700, Jonathan Nieder wrote:
Proposal:
1) /usr/lib/git-core/git-sh-prompt
2) git-sh-prompt(1)
Not sure about the sh part. The prompt function is very
Bash-specific, it won't work under a plain POSIX shell.
That's an interesting
On 25.10.12 18:00, Brian Gernhardt wrote:
On Oct 25, 2012, at 11:58 AM, Ben Walton bdwal...@gmail.com wrote:
Sed on Mac OS X doesn't handle \s in a sed expressions so use a more
portable character set expression instead.
Signed-off-by: Ben Walton bdwal...@gmail.com
Acked-by: Brian
On Thu, Oct 25, 2012 at 9:18 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Felipe Contreras wrote:
Show me a single remote helper that manually stores SHA-1's and I
might believe you, but I doubt that, marks are too convenient.
Oh dear lord. Why are you arguing? Explain how coming to a
On Thu, Oct 25, 2012 at 2:58 AM, Angelo Borsotti
angelo.borso...@gmail.com wrote:
Hello,
git push tag updates silently the specified tag. E.g.
git init --bare release.git
git clone release.git integrator
cd integrator
git branch -avv
touch f1; git add f1; git commit -m A
git tag v1
git
Basically $SUBJECT. See details in the 2nd patch.
Felipe Contreras (2):
gitk: simplify file filtering
gitk: handle --full-diff correctly
gitk-git/gitk | 36 +---
1 file changed, 17 insertions(+), 19 deletions(-)
--
1.8.0
--
To unsubscribe from this list:
git diff is perfectly able to do this with '-- files', no need for
manual filtering.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
gitk-git/gitk | 20 +++-
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index
Otherwise the files are missing from the diff, and the list of files.
We do this by creating a limitdiffs variable specific for the view which
can be turned of by using --full-diff.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
gitk-git/gitk | 20
1 file
Hi Torsten,
On Thu, Oct 25, 2012 at 5:28 PM, Torsten Bögershausen tbo...@web.de wrote:
BTW: While we are talking CVS: (I installed a fresh version)
cvs --version
Concurrent Versions System (CVS) 1.11.23 (client/server)
I have 1.12.13-MirDebian-8 here.
And t9200 fails:
git checkout
Jeff King wrote:
On Tue, Oct 23, 2012 at 04:39:56PM -0400, Phil Hord wrote:
git pull --rebase does some clever tricks to find the base
for $upstream , but it forgets that we may not have any
branch at all. When this happens, git merge-base reports its
usage help in the middle of an
Hi Drew,
You specified -f (force) and it did exactly what you asked. That is
fully documented (git help tag).
Yes, it is, and I used it to show that there is a need to specify
explicitly the intent to change a tag, that without such an indication
would not be changed.
Tags have many uses.
On Thu, Oct 25, 2012 at 11:32:29PM +0200, Jens Lehmann wrote:
@@ -270,7 +270,6 @@ cmd_add()
;;
--reference=*)
reference=$1
- shift
;;
Is that right? We'll unconditionally do a shift at the end of the
Sorry if I am drumming up and old issue here. I have noticed that with
git rebase -i, if your final line contains a commit and no newline, git
interprets that as remove this commit please.
I feel that a commit should be removed only if the entire line is removed, that
is the commit hash and title
62 matches
Mail list logo
