Hi Drew,
>
> Changing the tag in the local repository is a tag modification
> operation. Pushing that change to a remote repository DOES NOT execute
> "git tag" in the remote. Plain and simple the two are different
> operations.
>
They are different for what concerns the implementation. They
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 ti
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
Should I rebase this so it lands cleanly atop 38ae92e4 in next?
commit 38ae92e4d027063b9b87e51a9bf12809d10066f6
Author: W. Trevor King
Date: Tue Oct 23 17:00:21 2012 -0400
git-submodule: wrap branch option with "<>" in usage strings.
--
This email may be signed or encrypted with Gn
Thanks Andreas & Jeff. Your advice is much appreciated. Cheers, Thor
-Original Message-
From: Jeff King [mailto:p...@peff.net]
Sent: Thursday, 25 October 2012 7:10 PM
To: PROHASKA, Thor
Cc: Andreas Ericsson; 'git@vger.kernel.org'; 'Thor Home (tho...@hotkey.net.au)'
Subject: Re: Who is the
From: "Jeff King" Sent: Thursday, October 25, 2012 11:25
AM
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 com
Am 25.10.2012 17:06, schrieb Nicolas Morey-Chaisemartin:
> 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 a
From: "Jeff King" Sent: Thursday, October 25, 2012 11:26
AM
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-manu
Am 24.10.2012 01:15, schrieb Phil Hord:
> The submodule sync command was somehow left out when
> --recursive was added to the other submodule commands.
>
> Teach sync to handle the --recursive switch by recursing
> when we're in a submodule we are sync'ing.
>
> Change the report during sync to sh
When renaming orig_args to orig_flags in 98dbe63d (submodule: only
preserve flags across recursive status/update invocations) the call site
of the recursive cmd_status was forgotten. At that place orig_args is
still passed into the recursion, which is always empty now. This clears
all options when
Hello everybody,
I am looking for a setup where teplates can be handled easily.
For a better explanation of what I'm trying to achieve, I use the apache
httpd project as an example.
Apache httpd provides an extensively commented httpd.conf template, which
users can use as a starting point for th
Am 25.10.2012 12:45, schrieb W. Trevor King:
> 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
On Thu, Oct 25, 2012 at 3:05 PM, Angelo Borsotti
wrote:
---At 13:19 on Oct 25, 2012, Drew Northup wrote: [added for clarity]
>>Tags have many uses. Some of those uses are harmed when tags change
> and some aren't. That's a philosophical argument
>
> I agree, but in this case the computer does not
On 10/25/2012 08:08 PM, Ben Walton wrote:
Hi Torsten,
On Thu, Oct 25, 2012 at 5:28 PM, Torsten Bögershausen 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
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 u
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
Hi Torsten,
On Thu, Oct 25, 2012 at 5:28 PM, Torsten Bögershausen 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 t9200-git-cvsexp
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
---
gitk-git/gitk | 20
1 file changed, 12 insertions(+), 8
git diff is perfectly able to do this with '-- files', no need for
manual filtering.
Signed-off-by: Felipe Contreras
---
gitk-git/gitk | 20 +++-
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index d93bd99..b79dfdf 100755
--- a/gitk-
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: se
On Thu, Oct 25, 2012 at 2:58 AM, Angelo Borsotti
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 push origin tag
On Thu, Oct 25, 2012 at 9:18 AM, Jonathan Nieder 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 consensus
> on
On 25.10.12 18:00, Brian Gernhardt wrote:
>
> On Oct 25, 2012, at 11:58 AM, Ben Walton 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
>
> Acked-by: Brian Gernhardt
>
> I have an id
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 a
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.
>>
>> Int
On Oct 25, 2012, at 11:58 AM, Ben Walton 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
Acked-by: Brian Gernhardt
I have an identical change sitting in my git.git, I've just been too di
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
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 (pos
On Thu, Oct 25, 2012 at 9:50 AM, Sverre Rabbelier wrote:
> On Thu, Oct 25, 2012 at 12:48 AM, Jonathan Nieder 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, instead of needing
>>> Junio's wh
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
---
t/t9401-git-cvsserver-crlf.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-gi
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
>> 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
On Thu, Oct 25, 2012 at 4:45 PM, Jeff King 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.
>>
>> Signed
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 the
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_ad
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
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
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
> 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
This fixes the vast majority of test failures on HP NonStop.
Signed-off-by: Joachim Schmitz
---
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
--- a/Makefile
+++ b/Makefile
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.
-
> 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: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=${prefi
On Sun, Oct 21, 2012 at 09:52:37PM +0100, Philip Oakley wrote:
> Signed-off-by: Philip Oakley
Thanks, this makes sense.
> +refs/replace/``::
> + records the SHA1 of the object that replaces ``.
> + This is similar to info/grafts and is internally used and
> + maintained by `git repl
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 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 y
> 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'
> > + # som
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} && !is_rf
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
> + SANE_TOOL_PATH=${prefi
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
On Tue, Oct 23, 2012 at 10:33:26AM +, Gunnlaugur Þór Briem wrote:
> The --log-window-size parameter to git-svn fetch is undocumented.
>
> Minimally describe what it does and why the user might change it.
Thanks. Your description makes sense to me, but I do not have enough
git-svn knowledge t
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
> ---
> I made some unrela
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
> +TEC
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 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 t
On Thursday 25. October 2012 01:02:33 Brandon Casey wrote:
> On Mon, Oct 22, 2012 at 6:38 AM, Mat Arge 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 ho
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 h
On Wed, Oct 24, 2012 at 05:34:27PM +0200, Stefano Lattarini wrote:
> Before this change, output from ./configure could contain
> botched wording like this:
>
> checking Checking for POSIX Threads with '-pthread'... yes
>
> instead of the intended:
>
> checking for POSIX Threads with '-p
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 soft
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 n
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:]]/
>
>
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
On Thu, Oct 25, 2012 at 01:04:11AM -0400, Geert Bosch wrote:
> On Oct 24, 2012, at 23:54, Brian Gernhardt
> 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 say the latter
> shou
On Wed, Oct 24, 2012 at 09:52:52PM -0700, sza...@google.com wrote:
> Signed-off-by: Stefan Zager
> ---
> 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
> --- a/git-submodule.sh
>
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 "
is the raw format w
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
On Mon, Oct 22, 2012 at 6:38 AM, Mat Arge 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 implementation of
> thi
On Thu, Oct 25, 2012 at 12:48 AM, Jonathan Nieder 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, instead of needing
>> Junio's whence solution). I think all refs ended up being marked as
>> UNIN
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 UNINTER
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 hel
On Thu, Oct 25, 2012 at 12:34 AM, Jonathan Nieder 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 &&
> opts->revs->cmdline.rev->w
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
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
On Wed, Oct 24, 2012 at 11:19 PM, Felipe Contreras
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
>
> reset refs/h
73 matches
Mail list logo
