Ralf Thielow ralf.thie...@gmail.com writes:
It's more readable if \n is at the end of a line.
Q_(the following submodule (or one of its nested submodules)\n
uses a .git directory:
Thanks both. Perhaps we should do something like this?
-- 8 --
Subject: builtin/rm.c: consolidate error
Junio C Hamano gits...@pobox.com writes:
Will queue the attached, unless you spot glaring errors made by me,
coding while drunk ;-)
... aand, it turns out that I screwed up while running git
commit --amend (missed -a).
I should go to bed now.
-- 8 --
From: Kyle J. McKay mack...@gmail.com
On Jul 25, 2013, at 21:37, Jeff King wrote:
On Thu, Jul 25, 2013 at 03:39:13PM -0700, Kyle J. McKay wrote:
Overhaul the text of the http.url.* options documentation
providing a hopefully easier to understand itemized list of
matching behavior as suggested by and including text from
Jeff King.
On Jul 25, 2013, at 23:23, Kyle J. McKay wrote:
On Jul 25, 2013, at 21:37, Jeff King wrote:
You should add your S-O-B, too, for your bits.
Yes. I wanted to make certain it didn't get applied just yet. :)
Looks like it got patch snarfed anyway. ;-)
On Jul 25, 2013, at 23:07, Junio C Hamano
On Thu, Jul 25, 2013 at 07:33:16PM -0700, Gulshan Singh wrote:
I've been trying to figure out why I can't push from a shallow clone
(using --depth) to a repository. I've made simple examples where it
works, but I've read that in doesn't work in every case. However, I
can't come up with a case
-- Forwarded message --
Hi,
Since Git v1.8.4-rc0 had already been released, it's time to start new round
of git l10n. This time there are 99 new messages need to be translated.
The new git.pot is generated in commit v1.8.4-rc0-1-g28b3cff:
l10n: git.pot: v1.8.4 round 1 (99
26.07.2013, 05:50, Torsten Bögershausen tbo...@web.de:
On 2013-07-25 14.19, иванов иван wrote:
hello! there is problem vith git and cyrillic (utf-8) names of branches.
branch creates perfectly, but when i clone this remote branch to local host,
there are 2 bugs:
1) git branch doesnt
On 07/25/2013 04:47 PM, Marc Branchaud wrote:
On 13-07-25 09:45 AM, Daniele Segato wrote:
From d0f4eca712e7cf74286bfab306763a8a571b6c95 Mon Sep 17 00:00:00 2001
From: Daniele Segato daniele.seg...@gmail.com
Date: Thu, 25 Jul 2013 15:33:18 +0200
Subject: [PATCH] git-tag man: when to use
From 34fdcb56e5784699ffa327ebfcd2c5cd99b61d2d Mon Sep 17 00:00:00 2001
From: Daniele Segato daniele.seg...@gmail.com
Date: Thu, 25 Jul 2013 15:33:18 +0200
Subject: [PATCH] git-tag man: when to use lightweight or annotated tags
stress the difference between the two with suggestion on when the
On Thu, 25 Jul 2013 19:33:16 -0700
Gulshan Singh gsingh2...@gmail.com wrote:
I've been trying to figure out why I can't push from a shallow clone
(using --depth) to a repository. I've made simple examples where it
works, but I've read that in doesn't work in every case. However, I
can't come
Hi,
Reproduce:
$ git clone https://github.com/cms-sw/cmsdist.git
$ git branch -a | grep devel-gcc48
remotes/origin/IB/CMSSW_7_0_X/devel-gcc48
$ git checkout IB/CMSSW_7_0_X/devel-gcc48
fatal: reference is not a tree: IB/CMSSW_7_0_X/devel-gcc48
It has stopped to work with the last pull request.
'Twas brillig, and Matthieu Moy at 05/07/13 12:31 did gyre and gimble:
Ramkumar Ramachandra artag...@gmail.com writes:
John Keeping wrote:
I don't think this is really fix, it's more plastering over the
problem.
It defaulted to SSL_VERIFY_NONE before Net::SMTP::SSL was updated, and
the
Hi,
I need to re-organize a project using git. This project currently has
3 separate (central) repositories and I will need to move a large
number of files back and forth between them. While doing this, there
is development going on on each branch, and the restructuring will
take some time. I
See 390eb36 (upload-pack: optionally allow fetching from the tips of
hidden refs - 2013-01-28) for more information.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Maybe this too for completeness..
Documentation/technical/protocol-capabilities.txt | 7 +++
1 file changed, 7
On Fri, Jul 26, 2013 at 4:52 PM, David Abdurachmanov
david@gmail.com wrote:
Hi,
Reproduce:
$ git clone https://github.com/cms-sw/cmsdist.git
$ git branch -a | grep devel-gcc48
remotes/origin/IB/CMSSW_7_0_X/devel-gcc48
$ git checkout IB/CMSSW_7_0_X/devel-gcc48
fatal: reference is not a
On 25 Jul 2013, at 21:12, Felipe Contreras felipe.contre...@gmail.com wrote:
[…]
---
contrib/remote-helpers/git-remote-hg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 0194c67..f4e9d1c
On 25 Jul 2013, at 23:10, Antoine Pelisse apeli...@gmail.com wrote:
On Thu, Jul 25, 2013 at 10:40 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
That's true. Maybe something like:
for x in repos:
local_hg = os.path.join(shared_path, x, 'clone', '.hg')
if
Howdy,
I want to use Git over the local network in our company because the
internet connection isn't stable so I wonder how can I use git with pull
request (similar to Github)?
As I read about Gitorious.org I found it most candidate but I'm not sure
is it supports this feature or maybe
On 07/26/2013 03:36 PM, Muhammad Bashir Al-Noimi wrote:
Howdy,
I want to use Git over the local network in our company because the
internet connection isn't stable so I wonder how can I use git with
pull request (similar to Github)?
As I read about Gitorious.org I found it most candidate
On Fri, 26 Jul 2013 16:21:28 +0200
Muhammad Bashir Al-Noimi mbno...@gmail.com wrote:
I want to use Git over the local network in our company because the
internet connection isn't stable so I wonder how can I use git with
pull request (similar to Github)?
Depends on what feature set you
On 13-07-26 04:46 AM, Daniele Segato wrote:
From 34fdcb56e5784699ffa327ebfcd2c5cd99b61d2d Mon Sep 17 00:00:00 2001
From: Daniele Segato daniele.seg...@gmail.com
Date: Thu, 25 Jul 2013 15:33:18 +0200
Subject: [PATCH] git-tag man: when to use lightweight or annotated tags
When sending a patch
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
See 390eb36 (upload-pack: optionally allow fetching from the tips of
hidden refs - 2013-01-28) for more information.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Maybe this too for completeness..
You are absolutely right, and
Ramkumar Ramachandra artag...@gmail.com writes:
The --global section of git-config(1) currently reads like:
For writing options: write to global /.gitconfig file rather than the
^
start tilde
repository
On 07/26/2013 04:51 PM, Marc Branchaud wrote:
On 13-07-26 04:46 AM, Daniele Segato wrote:
From 34fdcb56e5784699ffa327ebfcd2c5cd99b61d2d Mon Sep 17 00:00:00 2001
From: Daniele Segato daniele.seg...@gmail.com
Date: Thu, 25 Jul 2013 15:33:18 +0200
Subject: [PATCH] git-tag man: when to use
stress the difference between the two with suggestion on when the user
should use one in place of the other.
Signed-off-by: Daniele Segato daniele.seg...@gmail.com
---
Documentation/git-tag.txt |9 +
1 file changed, 9 insertions(+)
diff --git a/Documentation/git-tag.txt
A command of e.g.
git push --set-upstream /tmp/t master
will call install_branch_config() with a remote name of /tmp/t. This
function will set the 'branch.master.remote' key to, which is
nonsensical as there is no remote by that name.
Instead, make sure that the remote given does exist when
When a cherry-pick results in an empty commit, git prints:
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
The last line is plain wrong in the case of a
On Fri, Jul 26, 2013 at 07:39:37PM +0200, Carlos Martín Nieto wrote:
A command of e.g.
git push --set-upstream /tmp/t master
will call install_branch_config() with a remote name of /tmp/t. This
function will set the 'branch.master.remote' key to, which is
nonsensical as there is no
On Fri, Jul 26, 2013 at 02:43:11PM -0400, Jeff King wrote:
On Fri, Jul 26, 2013 at 07:39:37PM +0200, Carlos Martín Nieto wrote:
A command of e.g.
git push --set-upstream /tmp/t master
will call install_branch_config() with a remote name of /tmp/t. This
function will set the
On Fri, Jul 26, 2013 at 07:33:01PM +0200, Daniele Segato wrote:
stress the difference between the two with suggestion on when the user
should use one in place of the other.
Signed-off-by: Daniele Segato daniele.seg...@gmail.com
The intent of your patch seems reasonable to me. There are a
Hey Fredrick,
It's good to know that work is being done on this. I still want to
understand it though, so I guess I'll ask specific questions about
Junio's response. He states,
If you cloned shallowly some time ago, worked without communicating
with the other side while the other side
On Fri, Jul 26, 2013 at 11:42:00PM +0530, Ramkumar Ramachandra wrote:
When a cherry-pick results in an empty commit, git prints:
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Jeff King wrote:
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -42,6 +42,17 @@ is used to specify custom GnuPG binary.
GnuPG key for signing. The configuration variable `gpg.program`
is used to specify custom GnuPG binary.
+Tag objects (created with `-a`,
There are currently 115 commands built into the git executable.
Before this commit, it was iterated over these commands in a linear
order, i.e. each command was checked.
As it turns out the commands are already sorted alphabetically, it is easy
to perform a binary search instead of linear
Hi,
Stefan Beller wrote:
--- a/git.c
+++ b/git.c
@@ -309,9 +309,18 @@ static int run_builtin(struct cmd_struct *p, int argc,
const char **argv)
return 0;
}
+static int compare_internal_command(const void *a, const void *b) {
+ /* The first parameter is of type char*
On 13-07-26 03:06 PM, Jeff King wrote:
On Fri, Jul 26, 2013 at 07:33:01PM +0200, Daniele Segato wrote:
stress the difference between the two with suggestion on when the user
should use one in place of the other.
Signed-off-by: Daniele Segato daniele.seg...@gmail.com
The intent of your
Jeff King wrote:
Hmm. I don't think I've run across this message myself, so perhaps I do
not understand the situation.
It's very simple.
# on branch master
$ git checkout -b test
$ git cherry-pick master
$ ls .git/sequencer
# missing
In the pseudo multi-pick case (I say pseudo
On 13-07-26 01:19 PM, Daniele Segato wrote:
By the way which is your role in the community?
Don't want to be rude, I just don't know who I'm talking about :) the
documentation maintainer?
I'm just a git user and (very) occasional contributor.
There's not much structure to the git community.
On Sat, Jul 27, 2013 at 02:47:47AM +0530, Ramkumar Ramachandra wrote:
2. Skip this commit and continue the rest of the cherry-pick sequence.
Nope, this is unsupported afaik.
Ah. I don't mind improving the message in the meantime, but it sounds
like this is a deficiency in sequenced
Jeff King wrote:
Ah. I don't mind improving the message in the meantime, but it sounds
like this is a deficiency in sequenced cherry-pick that needs addressed
eventually.
I'm especially irked by how slow rebase--am is, and want to replace it.
--
To unsubscribe from this list: send the line
Jeff King wrote:
Your patch is just swapping out git reset for cherry-pick --abort,
so I think that is a good improvement in the meantime.
Um, wasn't the idea of the original message that you can run git
reset and then git cherry-pick --continue?
Confused,
Jonathan
--
To unsubscribe from this
On Fri, Jul 26, 2013 at 02:37:05PM -0700, Jonathan Nieder wrote:
Jeff King wrote:
Your patch is just swapping out git reset for cherry-pick --abort,
so I think that is a good improvement in the meantime.
Um, wasn't the idea of the original message that you can run git
reset and then
From: Gulshan Singh gsingh2...@gmail.com
Sent: Friday, July 26, 2013 8:12 PM
Hey Fredrick,
It's good to know that work is being done on this. I still want to
understand it though, so I guess I'll ask specific questions about
Junio's response. He states,
If you cloned shallowly some time ago,
On Thu, Jul 25, 2013 at 11:23:23PM -0700, Kyle J. McKay wrote:
IMHO, this would be more clear as a single item, like:
. User name (e.g., `user` in `https://u...@example.com/repo.git`). If
the config key has a user name it must match the user name in the
URL exactly. If the config key
On Fri, 2013-07-26 at 14:43 -0400, Jeff King wrote:
On Fri, Jul 26, 2013 at 07:39:37PM +0200, Carlos Martín Nieto wrote:
A command of e.g.
git push --set-upstream /tmp/t master
will call install_branch_config() with a remote name of /tmp/t. This
function will set the
On Fri, Jul 26, 2013 at 05:40:36PM -0400, Jeff King wrote:
Jeff King wrote:
Your patch is just swapping out git reset for cherry-pick --abort,
so I think that is a good improvement in the meantime.
Um, wasn't the idea of the original message that you can run git
reset and then
Looks like this was introduced in 1.8.3.3.
To reproduce, run
git init repo
cd repo
mkdir splitme
touch splitme/foo
git add splitme/
git commit -m 'Add foo'
git subtree split -P splitme -b splitme-only
After that, I get:
$ git log splitme-only
commit 6ce8124a0b5e52d4bba198144d2f3f664d7b19e7
On Fri, Jul 26, 2013 at 06:43:59PM -0400, Jeff King wrote:
I think instead we would want to leave the single-commit case alone, and
for the multi-commit case add ...and then cherry-pick --continue. That
message is generated from within git-commit, though; I guess it would
need to learn about
Jeff King wrote:
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -63,8 +63,14 @@ N_(The previous cherry-pick is now empty, possibly due to
conflict resolution.\
If you wish to commit it anyway, use:\n
\n
git commit --allow-empty\n
+\n);
+static const char
On Sat, Jul 27, 2013 at 12:29:47AM +0200, Carlos Martín Nieto wrote:
Is it nonsensical? It does not make sense for the @{upstream} magic
token, because we will not have a branch in tracking branch refs/remotes
This was the main point, yes; the only time I've seen it used is by
On Fri, Jul 26, 2013 at 04:08:57PM -0700, Jonathan Nieder wrote:
Jeff King wrote:
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -63,8 +63,14 @@ N_(The previous cherry-pick is now empty, possibly due
to conflict resolution.\
If you wish to commit it anyway, use:\n
\n
On Fri, Jul 26, 2013 at 07:12:11PM -0400, Jeff King wrote:
If that is what you want to prevent, I do not think checking for a named
remote is sufficient. You can also be pushing to a branch on a named
remote that is not part of your fetch refspec, in which case you do not
have a tracking
On Fri, Jul 26, 2013 at 07:19:02PM -0400, Jeff King wrote:
Or
If you wish to commit it anyway, use
git commit --allow-empty
If you wish to skip this commit, use
git reset
Then git cherry-pick --continue will resume cherry-picking
On Fri, Jul 26, 2013 at 4:50 PM, Stefan Beller
stefanbel...@googlemail.com wrote:
There are currently 115 commands built into the git executable.
Before this commit, it was iterated over these commands in a linear
order, i.e. each command was checked.
As it turns out the commands are already
When core.precomposeunicode was introduced, it was set to false
by default, to be compatible with older versions of Git.
Whenever UTF-8 file names are used in a mixed environment,
the Mac OS users need to find out that this configuration exist
and set it to true manually.
There is no measurable
On Jul 26, 2013, at 15:27, Jeff King wrote:
On Thu, Jul 25, 2013 at 11:23:23PM -0700, Kyle J. McKay wrote:
IMHO, this would be more clear as a single item, like:
. User name (e.g., `user` in `https://u...@example.com/repo.git`).
If
the config key has a user name it must match the user
On Fri, Jul 26, 2013 at 07:15:07PM -0700, Kyle J. McKay wrote:
So there's a version of this in next as cea9928 and I think that
version is fine. If the documentation gets updated in the future, or
perhaps moved to a separate urls-matching.txt for some reason at some
point (git config --url,
On Jul 26, 2013, at 19:43, Jeff King wrote:
On Fri, Jul 26, 2013 at 07:15:07PM -0700, Kyle J. McKay wrote:
So there's a version of this in next as cea9928 and I think that
version is fine. If the documentation gets updated in the future, or
perhaps moved to a separate urls-matching.txt for
On Mon, Jul 15, 2013 at 01:48:23PM -0400, Greg Troxel wrote:
I am curious if anyone has actual experiences to share, either
a report of corruption after a crash (where corruption means that
either 1) git fsck reports worse than dangling objects or 2) some ref
did not either point to
On Wed, Jul 10, 2013 at 05:27:57PM -0500, Matt Schoen wrote:
I've been using git for some time now, and host my remote bare
repositories on my shared hosting account at Dreamhost.com. As a
protective feature on their shared host setup, they enact a policy
that kills processes that consume
60 matches
Mail list logo
