On Mon, 2015-02-23 at 09:21 +0100, Dennis Kaarsemaker wrote:
It used to be for a brief period in history, between daa22c6f8d (2.1.0)
and 1f32ecf (2.2.2).
Ah thanks,... I have 2.1.4 which explains this :)
Cheers,
Chris.
smime.p7s
Description: S/MIME cryptographic signature
The documentation of 'git submodule update' has several problems:
1) It mentions that value 'none' of submodule.$name.update can be
overridden by --checkout, but other combinations of configuration
values and command line options are not mentioned.
2) The documentation of
--to requires a directory, not a file. Say so in the usage string.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 8b2bf20..8cdcd07 100644
---
sequencer calls commit with default options, which implies
--cleanup=default unless the user specified something else in their
config. This leads to cherry-picked commits getting a cleaned up commit
message, which is usually not an intended side-effect.
Make the sequencer use --cleanup=verbatim
On Sat, Feb 21 2015, Junio C Hamano wrote:
Michal Sojka sojk...@fel.cvut.cz writes:
update::
+Update the registered submodules to match what the superproject
+expects by cloning missing submodules and updating the working
+tree of the submodules. The updating can be done in
Junio C Hamano venit, vidit, dixit 22.02.2015 22:41:
[Stalled]
* nd/list-files (2015-02-09) 21 commits
. t3080: tests for git-list-files
. list-files: -M aka diff-cached
. list-files -F: show submodules with the new indicator ''
. list-files: add -F/--classify
. list-files: show
On Mon, Feb 23, 2015 at 03:16:59PM +0100, Michael J Gruber wrote:
--to requires a directory, not a file. Say so in the usage string.
Sounds like a good goal, but...
- OPT_FILENAME(0, to, opts.new_worktree,
+ OPT_STRING(0, to, opts.new_worktree, N_(dir),
I'm using git on windows 7.
$ git --version
git version 1.9.4.msysgit.0
Some days ago I uploaded a latex package to CTAN (www.ctan.org).
I created the zip-file with
git archive --format=zip --prefix=citeall/
--output=zip/citeall_2015-02-20.zip HEAD
The zip contained four text files and a
It's not that I want to use CR as line ending. We just had to process a
repository where it was the case. We use git blame as an automatic processing
step in a bigger system. So if a line does not exist for git blame but it does
exist for other parts of the system (which read the same file) we
--
Hi ,
I’m pleased to send this mail regarding your products below :
-Shoes 300 UNITS
-Poloshirts 700 UNITS
Please can you send me your offer included express delivery to UK.
PS: To celebrate my foundation's party this week
Best regards)
MR. Yaya Toure
On 15-02-22 02:21 PM, Junio C Hamano wrote:
Michael J Gruber g...@drmicha.warpmail.net writes:
git status carefully names a detached HEAD at resp. from a rev or
ref depending on whether the detached HEAD has moved since. git branch
always uses from, which can be confusing, because a
Hi,
I just fell in a little trap, in which you may find interest.
I'm using git on the command line (on an Elementary OS system : Linux
3.2.0-76-generic #111-Ubuntu SMP Tue Jan 13 22:16:09 UTC 2015 x86_64
x86_64 x86_64 GNU/Linux).
git version : 2.3.0
My system is configured in french.
Jeff King venit, vidit, dixit 23.02.2015 15:42:
On Mon, Feb 23, 2015 at 03:16:59PM +0100, Michael J Gruber wrote:
--to requires a directory, not a file. Say so in the usage string.
Sounds like a good goal, but...
-OPT_FILENAME(0, to, opts.new_worktree,
+
On 15-02-22 12:38 PM, Michael J Gruber wrote:
git status carefully names a detached HEAD at resp. from a rev or
ref depending on whether the detached HEAD has moved since. git branch
always uses from, which can be confusing, because a status-aware user
would interpret this as moved detached
On Mon, Feb 23, 2015 at 09:02:58AM +0100, Matthieu Moy wrote:
That content was cut-and-pasted into Google's application interface.
Matthieu, as backup admin you should have access to tweak that if there
are typos, etc (and I will probably not be available to apply fixes from
now until the
Marc Branchaud venit, vidit, dixit 23.02.2015 16:12:
On 15-02-22 12:38 PM, Michael J Gruber wrote:
git status carefully names a detached HEAD at resp. from a rev or
ref depending on whether the detached HEAD has moved since. git branch
always uses from, which can be confusing, because a
On Fri, Feb 20, 2015 at 10:16:18PM -0700, Technext wrote:
Thanks Junio for the prompt reply! :) Yes, that's exactly how i would like
things to be. I'll definitely try to push this thing and see if this flow
can be implemented.
However, can you please guide me whether there's any way i could
Here's a mini-war on file-type arguments being specified as OPT_STRING
(in order to repent for doing so myself).
1/4 introduces OPT_PATH which is like OPT_FILENAME, but takes an additional
argument which names the option argument.
2/4 converts OPT_STRING to OPT_FILENAME where it makes sense
3/4
Some commands use OPT_STRING to specify a file argument. Let them use
OPT_FILENAME so that they can profit from path prefixing.
This excludes low-level commands like the credential helpers.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
This could be before 1/4 but seemed more
Hello everyone,
Here's the situation:
Back in 2012, we cloned a MIPS repo, which was itself a clone of
a 3.4.2 kernel with ~40 MIPS-specific patches applied.
Then the devs started pushing patches; and once in a while, the
maintainer would sync with the mainline kernel. I don't know
what tool
On Mon, Feb 23, 2015 at 05:17:44PM +0100, Michael J Gruber wrote:
diff --git a/archive.c b/archive.c
index 94a9981..b4da255 100644
--- a/archive.c
+++ b/archive.c
@@ -419,7 +419,7 @@ static int parse_archive_args(int argc, const char **argv,
OPT_STRING(0, format, format,
--to requires a directory, not a file. Say so in the usage string.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
I did not spot any other misuses of OPT_FILENAME (for non-files).
builtin/checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
Many options are paths, but not files. Introduce OPT_PATH which does
the same path processing as OPT_FILENAME but allows to name the argument.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
Documentation/technical/api-parse-options.txt | 5 +
parse-options.h
On 15-02-23 11:24 AM, Michael J Gruber wrote:
Marc Branchaud venit, vidit, dixit 23.02.2015 16:12:
On 15-02-22 12:38 PM, Michael J Gruber wrote:
git status carefully names a detached HEAD at resp. from a rev or
ref depending on whether the detached HEAD has moved since. git branch
always uses
Some commands use OPT_STRING to specify a path type argument. Let them
use OPT_PATH so that they can profit from path prefixing.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/clone.c | 4 ++--
builtin/init-db.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Hi,
this is a comment to enhance
the git distribution under Window$.
It would be a nice feature to add rsync
to git bash distribution for Window$.
In order to be able to show how powerful is GNU tools,
to those how still works under M$ OS,
or those that are forced to.
As far as I know, adding
On Mon, Feb 23, 2015 at 01:07:13PM -0800, Junio C Hamano wrote:
- OPT_STRING(0, template, option_template, N_(template-directory),
+ OPT_PATH(0, template, option_template, N_(template-directory),
N_(directory from which templates will be used)),
OPT_CALLBACK(0 ,
On 23 Feb 2015, Kevin Daudt wrote:
On Fri, Feb 20, 2015 at 10:16:18PM -0700, Technext wrote:
Thanks Junio for the prompt reply! :) Yes, that's exactly how i would
like things to be. I'll definitely try to push this thing and see if
this flow can be implemented.
However, can you please
Dennis Kaarsemaker den...@kaarsemaker.net writes:
On zo, 2015-02-22 at 10:44 -0800, Junio C Hamano wrote:
Christoph Anton Mitterer cales...@scientia.net writes:
Just a question about files like:
.git/config
.git/hooks/*.sample
Is there any reason that these are created executable?
Michael J Gruber g...@drmicha.warpmail.net writes:
Many options are paths, but not files. Introduce OPT_PATH which does
the same path processing as OPT_FILENAME but allows to name the argument.
...
diff --git a/parse-options.h b/parse-options.h
index 7940bc7..5127a5d 100644
---
Mason slash@free.fr writes:
But 'git am' just gave up. Small sample of errors:
error: patch failed: drivers/block/Kconfig:411
error: drivers/block/Kconfig: patch does not apply
error: drivers/tty/serial/8250/8250.c: does not exist in index
error: patch failed:
Michael J Gruber g...@drmicha.warpmail.net writes:
status, status -s and the like are in an ordinary user's tool box.
ls-files isn't, at least not with -t, which we even mark as deprecated.
That makes me wonder, though, how difficult it would be to
wt_status_collect_unchanged() and to
Am 23.02.2015 um 14:58 schrieb Ulrike Fischer:
I'm using git on windows 7.
$ git --version
git version 1.9.4.msysgit.0
Git's code for ZIP file creation hasn't changed since then.
Some days ago I uploaded a latex package to CTAN (www.ctan.org).
I created the zip-file with
git archive
On Sun, Feb 22, 2015 at 11:33:16PM +0100, René Scharfe wrote:
Am 22.02.2015 um 21:00 schrieb Junio C Hamano:
René Scharfe l@web.de writes:
Use strlcpy() instead of calling strncpy() and then setting the last
byte of the target buffer to NUL explicitly. This shortens and
simplifies the
Torsten Bögershausen tbo...@web.de writes:
On 2015-02-19 14.48, Sokolov, Konstantin (ext) wrote:
I encounter unexpected behavior in the following case:
file content:
line1CRLF
line2CR
line3CRLF
line4
You can mark a file as CRLF terminated via attributes system and
have Git convert
Michael J Gruber g...@drmicha.warpmail.net writes:
Some commands use OPT_STRING to specify a file argument. Let them use
OPT_FILENAME so that they can profit from path prefixing.
If the existing code that takes string actually already works
correctly, they must be doing the necessary prefixing
Am 16.02.2015 um 00:43 schrieb Junio C Hamano:
The sanitize helper wanted to strip the similarity and
dissimilarity scores when making comparison, but it was
stripping away the object names as well.
While we do not want to require the exact object names the tests
expect to be maintained, as
On Wed, Feb 18, 2015 at 10:59 AM, Matthew Brett matthew.br...@gmail.com wrote:
On Thu, Feb 5, 2015 at 10:58 AM, Junio C Hamano gits...@pobox.com wrote:
Matthieu Moy matthieu@grenoble-inp.fr writes:
NAME
git-rebase - Forward-port local commits to the updated upstream head
=
Michael J Gruber g...@drmicha.warpmail.net writes:
sequencer calls commit with default options, which implies
--cleanup=default unless the user specified something else in their
config. This leads to cherry-picked commits getting a cleaned up commit
message, which is usually not an intended
Thank you for going into the matter. I was not aware of the textconv filter.
This is definitely a decent solution. But what exactly do you mean by Even
though we have an option to mark CR alone as the end of line marker? Is
there really such an option in Git or did you mean that it's possible
Johannes Sixt j...@kdbg.org writes:
diff --git a/t/diff-lib.sh b/t/diff-lib.sh
index 75a35fc..c211dc4 100644
--- a/t/diff-lib.sh
+++ b/t/diff-lib.sh
@@ -1,6 +1,6 @@
:
-sanitize_diff_raw='/^:/s/ '$_x40' '$_x40' \([A-Z]\)[0-9]* / X X
\1# /'
+sanitize_diff_raw='/^:/s/
On Mon, Feb 23, 2015 at 05:17:45PM +0100, Michael J Gruber wrote:
diff --git a/builtin/clone.c b/builtin/clone.c
index a9af3f2..15941c5 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -80,7 +80,7 @@ static struct option builtin_clone_options[] = {
N_(initialize
Junio C Hamano gits...@pobox.com writes:
+Update the registered submodules to match what the superproject
+expects by cloning missing submodules and updating the working tree of
+the submodules. The updating can be done in several ways depending
+on command line options and the value of
Sokolov, Konstantin (ext) konstantin.sokolov@siemens.com
writes:
Thank you for going into the matter. I was not aware of the textconv
filter. This is definitely a decent solution. But what exactly do you
mean by Even though we have an option to mark CR alone as the end
of line marker?
On Mon, Feb 23, 2015 at 11:00:21AM -0800, Junio C Hamano wrote:
Michael J Gruber g...@drmicha.warpmail.net writes:
status, status -s and the like are in an ordinary user's tool box.
ls-files isn't, at least not with -t, which we even mark as deprecated.
That makes me wonder, though,
Junio C Hamano gits...@pobox.com writes:
Michael J Gruber g...@drmicha.warpmail.net writes:
Some commands use OPT_STRING to specify a file argument. Let them use
OPT_FILENAME so that they can profit from path prefixing.
If the existing code that takes string actually already works
From: Michael J Gruber g...@drmicha.warpmail.net
Many options are paths, but not files. Introduce OPT_PATH which does
the same path processing as OPT_FILENAME but allows to name the
argument.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
On Fri, 2015-02-20 at 12:59 -0800, Junio C Hamano wrote:
David Turner dtur...@twopensource.com writes:
On Fri, 2015-02-20 at 06:38 +0700, Duy Nguyen wrote:
* 'git push'?
This one is not affected by how deep your repo's history is, or how
wide your tree is, so should be quick..
Michal Sojka sojk...@fel.cvut.cz writes:
The documentation of 'git submodule update' has several problems:
Thanks, this round looks much better.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ae6791d..fb2ae37 100644
--- a/Documentation/config.txt
+++
2015-02-16 16:27 GMT-07:00 Alex Henrie alexhenri...@gmail.com:
2015-02-09 14:55 GMT-07:00 Junio C Hamano gits...@pobox.com:
Alex Henrie alexhenri...@gmail.com writes:
This is just a friendly reminder that this patch has been sitting in
the mailing list archives for a couple of weeks, and
The platform is Windows server 2008
Git version is 1.9.5.msysgit.0
I have a repository and I want EVERYTHING in the repository to be checked
out into the workspace EXCEPT one directory. I have a machine with git
version 1.7.8.msysgit.0 and the following syntax in
.git/info/sparse-checkout file
Jeff King p...@peff.net writes:
So that being said, I did complete the application. We can still
withdraw if we want before students start applying, or we can put a
disclaimer on the ideas page.
I'm in favor of the disclaimer, but I won't fight if other people think
it's better to just
On zo, 2015-02-22 at 10:44 -0800, Junio C Hamano wrote:
Christoph Anton Mitterer cales...@scientia.net writes:
Just a question about files like:
.git/config
.git/hooks/*.sample
Is there any reason that these are created executable? Especially
the
config file?
In a new repository
Junio C Hamano venit, vidit, dixit 22.02.2015 20:21:
Michael J Gruber g...@drmicha.warpmail.net writes:
git status carefully names a detached HEAD at resp. from a rev or
ref depending on whether the detached HEAD has moved since. git branch
always uses from, which can be confusing, because a
On Mon, Feb 23, 2015 at 9:16 PM, Michael J Gruber
g...@drmicha.warpmail.net wrote:
--to requires a directory, not a file. Say so in the usage string.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
builtin/checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
On Mon, Feb 23, 2015 at 8:02 PM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Feb 24, 2015 at 10:12 AM, Stefan Beller sbel...@google.com wrote:
One of the biggest problems of a new protocol would be deployment
as the users probably would not care too deeply. It should just
work in the sense
On Mon, Feb 23, 2015 at 8:02 PM, Duy Nguyen pclo...@gmail.com wrote:
It's very hard to keep backward compatibility if you want to stop the
initial ref adverstisement, costly when there are lots of refs. But we
can let both protocols run in parallel, with the old one advertise the
presence of
Inspired by a discusson on the scaling of git in the last days,
I thought about starting the adventure to teach git a new transport
protocol.
One of the biggest problems of a new protocol would be deployment
as the users probably would not care too deeply. It should just
work in the sense that
In the future we may want to have multiple different versions for
the transport protocol each optimized for a certain aspect of the
transport such as latency, bandwidth, CPU load etc. To make this
future proof document a possible way how to advertise the versions
such that the client can store it
Signed-off-by: Stefan Beller sbel...@google.com
---
builtin/receive-pack.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index e0ce78e..a077b1d 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -71,6 +71,8 @@ static
This string would tell the client that git-receive-packv2 as well as
git-receive-pack would be supported.
Signed-off-by: Stefan Beller sbel...@google.com
---
builtin/receive-pack.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
On Tue, Feb 24, 2015 at 10:12 AM, Stefan Beller sbel...@google.com wrote:
One of the biggest problems of a new protocol would be deployment
as the users probably would not care too deeply. It should just
work in the sense that the user should not even sense that the
protocol changed.
Agreed.
62 matches
Mail list logo
