On 11/04/2012 12:41 PM, Jeff King wrote:
> On Sun, Nov 04, 2012 at 07:46:51AM +0100, Michael Haggerty wrote:
>
>> Use ALLOC_GROW() rather than inline code to manage memory in
>> strbuf_split_buf(). Rename "pos" to "nr" because it better describes
>> the use of the variable and it better conforms
Am 11/6/2012 7:56, schrieb Eric Miao:
> On Tue, Nov 6, 2012 at 2:39 PM, Johannes Sixt wrote:
>> Am 11/6/2012 1:58, schrieb Eric Miao:
>>> E.g. when we merged a series of patches:
>>>
>>> [PATCH 00/08]
>>> [PATCH 01/08]
>>> ...
>>> [PATCH 08/08]
>>>
>>> How do we know this whole series afte
On 10/30/2012 07:23 PM, Ramsay Jones wrote:
> [...]
> Just to be clear, this is true for the MinGW port to Windows, but *not*
> the cygwin port.
>
> [...]
>
> ditto
Thanks for clarifying these points. It seems like this patch series is
not going to be usable (because of fears that it might cause
On Tue, Nov 6, 2012 at 2:39 PM, Johannes Sixt wrote:
> Am 11/6/2012 1:58, schrieb Eric Miao:
>> On Mon, Nov 5, 2012 at 10:40 PM, Michael J Gruber
>> wrote:
>>> Eric Miao venit, vidit, dixit 05.11.2012 15:12:
The problem is, most cases we have no idea of the base rev1, and commit
rev2
>
Am 11/6/2012 1:58, schrieb Eric Miao:
> On Mon, Nov 5, 2012 at 10:40 PM, Michael J Gruber
> wrote:
>> Eric Miao venit, vidit, dixit 05.11.2012 15:12:
>>> The problem is, most cases we have no idea of the base rev1, and commit rev2
>>> which it's leading up to. E.g. for a single patch which is betw
On Mon, Nov 5, 2012 at 10:40 PM, Michael J Gruber
wrote:
> Eric Miao venit, vidit, dixit 05.11.2012 15:12:
>> The problem is, most cases we have no idea of the base rev1, and commit rev2
>> which it's leading up to. E.g. for a single patch which is between
>> commit rev1..rev2,
>> how do we find o
On Mon, Nov 05, 2012 at 09:21:13AM -0800, Mathieu Dutour wrote:
First, note that this list is a support channel for Git newbies, and
your question appears to be more about Git source code itself so I'd say
it better fits the main Git list which is git at vger.kernel.org.
I Cc'ed this my response h
On Mon, 5 Nov 2012 17:12:12 -0500
Pete Wyckoff wrote:
> Thanks, that is interesting output.
>
> Adding Vitor who knows his way around the branch detection
> code. The first mail by Arthur is here, which focuses more
> on the backtrace from "p4 describe" errors, but also suggests
> something is
Git configuration items can not contain underscores in their name; the
'remote_heads' feature can not be enabled on a per-repository basis with
that name.
This changes the git-config option to be `gitweb.remoteheads` but does
not change the gitweb.conf option, to avoid backwards compatibility
issu
As per discussion on msysgit user group:
https://groups.google.com/forum/?fromgroups=#!topic/msysgit/U_a982_a3rc/discussion
we found the following patch is required to get rid of weird terminal
characters for other tools such as GitExtensions for Windows
---8<---
diff --git a/sideband.c b/sideband
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hi,
I found something looking like a bug:
The following lines prepares a small exmaple:
# create git repo
git init
# create file a and commit it
touch a && git add a && git commit -m first
# rename a to b and commit it
git mv a b && git commit -m sec
On Mon, Nov 05, 2012 at 12:04:06PM -0800, hong zhang wrote:
> Could anyone explain how the git commit ID will include all the files
> that devloper makes changes on?
>
> How git commit ID works?
To expand on the answer provided by Magnus, I would also suggest reading
the classic "Git from the bo
Thanks for looking into this, guys!
I seem to run into this with some regularity, but my setting is
apply.whitespace=strip rather than 'fix'.
Is there an obvious workaround?
Here are my remaining settings, sanitized for file paths and URLs:
svn.rmdir=true
push.default=upstream
color.ui=auto
col
Andreas Krey writes:
> But is there a direct way to convert the current working tree into a
> tree object?
You can create a temporary index by setting the GIT_INDEX_FILE env var.
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8
a.fou...@amesys.fr wrote on Mon, 05 Nov 2012 02:02 -0800:
> Hi,
>
> Here is my import :
>
> Importing from //depot@all into X
> Initialized empty Git repository in
> /home/arthur/projets_git/X/X/.git/
> Importing revision 4258 (43%)
> Importing new branch depot/DEV_DATA
>
> R
On Mon, 05 Nov 2012 21:56:28 +0100, Andreas Krey wrote:
> On Mon, 05 Nov 2012 21:29:48 +, Andreas Krey wrote:
> ...
> > But still I'd like to know if there is a cleaner solution,
> > esp. with respect to the index.
>
> Actually, it seems
>
> commit -m 'index'
> commit -a -m 'worktree'
> .
Hi,
On Mon, Nov 05, 2012 at 05:30:51PM +0100, Francis Moreau wrote:
> I'm wondering why the --init option from git-submodule-update is not
> at least the defaut. Or even wilder, why this option exists at all and
> git-submodule-update always behave like --init was always passed.
That was a design
Hi all,
I have a workflow for which I can't quite find the git tooling.
Essentially what I want is like 'git commit -a', except that I
want the resulting commit on a branch I name instead of the current
one, and I want my current index not being modified. At the moment
I emulate that via
git c
On Mon, 05 Nov 2012 21:29:48 +, Andreas Krey wrote:
...
> But still I'd like to know if there is a cleaner solution,
> esp. with respect to the index.
Actually, it seems
commit -m 'index'
commit -a -m 'worktree'
...push
git reset HEAD^
git reset --soft HEAD^
might do the index trick.
B
On Monday, November 05, 2012 at 15:04 EST,
hong zhang wrote:
> Could anyone explain how the git commit ID will include all the files
> that devloper makes changes on?
>
> How git commit ID works?
In short, a Git commit points to a tree object that describes the full
state of the source tree
vitor@gmail.com wrote on Mon, 05 Nov 2012 17:37 +:
> Pete Wyckoff padd.com> writes:
>
> >
> > From: Gary Gibbons perforce.com>
> >
> > For -M option (detectRenames) in P4Submit, use 'p4 move' rather
> > than 'p4 integrate'. Check Perforce server for exisitence of
> > 'p4 move' and use
br...@interlinx.bc.ca wrote on Mon, 05 Nov 2012 10:25 -0500:
> On 12-11-04 05:10 PM, Pete Wyckoff wrote:
> > Which network filesystem and OS are you using?
>
> The filesystem is Lustre. So not only is it networked, it is
> distributed where the namespace and data store are handled by different
>
Pete Wyckoff padd.com> writes:
>
> From: Gary Gibbons perforce.com>
>
> For -M option (detectRenames) in P4Submit, use 'p4 move' rather
> than 'p4 integrate'. Check Perforce server for exisitence of
> 'p4 move' and use it if present, otherwise revert to 'p4 integrate'.
>
Hi Pete,
I've just
Hello,
I'm wondering why the --init option from git-submodule-update is not
at least the defaut. Or even wilder, why this option exists at all and
git-submodule-update always behave like --init was always passed.
Thanks
--
Francis
--
To unsubscribe from this list: send the line "unsubscribe git"
On Mon, Nov 5, 2012 at 5:00 PM, Michael J Gruber
wrote:
> [trimmed down heavily by mjg]
> Felipe Contreras venit, vidit, dixit 05.11.2012 16:22:
>> On Mon, Nov 5, 2012 at 10:25 AM, Michael J Gruber
>> wrote:
>>> Felipe Contreras venit, vidit, dixit 02.11.2012 17:09:
On Fri, Nov 2, 2012 at 12
[trimmed down heavily by mjg]
Felipe Contreras venit, vidit, dixit 05.11.2012 16:22:
> On Mon, Nov 5, 2012 at 10:25 AM, Michael J Gruber
> wrote:
>> Felipe Contreras venit, vidit, dixit 02.11.2012 17:09:
>>> On Fri, Nov 2, 2012 at 12:03 PM, Michael J Gruber
>>> wrote:
> There is no lack of openn
On Mon, Nov 5, 2012 at 4:22 PM, Felipe Contreras
wrote:
> On Mon, Nov 5, 2012 at 10:25 AM, Michael J Gruber
> wrote:
>> For one thing, contributors on the kernel list are open to technical
>> arguments, and that includes the arguments of others; just like we are
>> here. On the other hand, you s
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-bzr | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-bzr
b/contrib/remote-helpers/git-remote-bzr
index c981fda..1a06a0a 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/re
Strictly speaking bzr doesn't need any changes to interact with remote
repositories, but it's dead slow.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-bzr | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helper
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-bzr | 295 ++
1 file changed, 295 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-bzr
b/contrib/remote-helpers/git-remote-bzr
index ed893b0..9e0062f 100755
--- a/contrib/remote-hel
Hi,
I decided to get rid of bzr-fastimport; too much complexity for not really that
much of a gain.
The only feature I know is missing is support for executable modes and links.
I haven't verified that the resulting output is exactly the same as with other
tools, so be careful while using this.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/test-bzr.sh | 111 +
1 file changed, 111 insertions(+)
create mode 100755 contrib/remote-helpers/test-bzr.sh
diff --git a/contrib/remote-helpers/test-bzr.sh
b/contrib/remote-helpers/test-bzr.sh
new f
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-bzr | 353 ++
1 file changed, 353 insertions(+)
create mode 100755 contrib/remote-helpers/git-remote-bzr
diff --git a/contrib/remote-helpers/git-remote-bzr
b/contrib/remote-helpers/git-remote-
On Mon, Nov 5, 2012 at 3:13 PM, Michael J Gruber
wrote:
> Felipe Contreras venit, vidit, dixit 02.11.2012 19:01:
>> I talked with some people in #mercurial, and apparently there is a
>> concept of a 'changelog' that is supposed to store these changes, but
>> since the format has changed, the cont
On Mon, Nov 5, 2012 at 10:25 AM, Michael J Gruber
wrote:
> Felipe Contreras venit, vidit, dixit 02.11.2012 17:09:
>> On Fri, Nov 2, 2012 at 12:03 PM, Michael J Gruber
>> wrote:
>>> Andreas Ericsson venit, vidit, dixit 02.11.2012 10:38:
On 11/01/2012 02:46 PM, René Scharfe wrote:
>
>
On 12-11-04 05:10 PM, Pete Wyckoff wrote:
>
> Fascinating problem and observations.
I thought so as well.
> We've been using NFS with git for quite a while and have never
> seen such an error.
Could be because NFS manages to operate more atomically given that it's
just the network exporting of
Eric Miao venit, vidit, dixit 05.11.2012 15:12:
> The problem is, most cases we have no idea of the base rev1, and commit rev2
> which it's leading up to. E.g. for a single patch which is between
> commit rev1..rev2,
> how do we find out rev1 and rev2.
So, then the question is: What do you know/ha
martyone venit, vidit, dixit 05.11.2012 13:57:
> Hello,
>
> the combination of --graph and --oneline sometimes produces output
> which is -- at least for me -- not clear about parent-child relation
> between commits. I noticed it when using with --simplify-by-decoration
> switch but it should not
Felipe Contreras venit, vidit, dixit 02.11.2012 19:01:
> On Fri, Nov 2, 2012 at 5:41 PM, Felipe Contreras
> wrote:
>> On Fri, Nov 2, 2012 at 3:48 PM, Jeff King wrote:
>>> On Thu, Nov 01, 2012 at 05:08:52AM +0100, Felipe Contreras wrote:
>>>
> Turns out msysgit's remote-hg is not exporting the
The problem is, most cases we have no idea of the base rev1, and commit rev2
which it's leading up to. E.g. for a single patch which is between
commit rev1..rev2,
how do we find out rev1 and rev2.
On Mon, Nov 5, 2012 at 9:39 PM, Michael J Gruber
wrote:
> Eric Miao venit, vidit, dixit 05.11.2012 0
Eric Miao venit, vidit, dixit 05.11.2012 03:26:
> Hi All,
>
> Does anyone know if git has sort of support for a series of patches, i.e.
> a patchset or changeset? So whenever we know the SHA1 id of a single
> patch/commit, we know the patchset it belongs to. This is normal when
> we do big changes
Hello,
the combination of --graph and --oneline sometimes produces output
which is -- at least for me -- not clear about parent-child relation
between commits. I noticed it when using with --simplify-by-decoration
switch but it should not be specific to the use of this switch.
See this example ou
Hi,
Here is my import :
Importing from //depot@all into X
Initialized empty Git repository in
/home/arthur/projets_git/X/X/.git/
Importing revision 4258 (43%)
Importing new branch depot/DEV_DATA
Resuming with change 4258
Importing revision 5828 (63%)
Importing new branch
Felipe Contreras venit, vidit, dixit 02.11.2012 17:09:
> On Fri, Nov 2, 2012 at 12:03 PM, Michael J Gruber
> wrote:
>> Andreas Ericsson venit, vidit, dixit 02.11.2012 10:38:
>>> On 11/01/2012 02:46 PM, René Scharfe wrote:
Also, and I'm sure you didn't know that, "Jedem das Seine" (to eac
Change link_alt_odb_entries() to take the length of the "alt"
parameter rather than a pointer to the end of the "alt" string. This
is the more common calling convention and simplifies the code a tiny
bit.
Signed-off-by: Michael Haggerty
---
sha1_file.c | 10 +-
1 file changed, 5 inserti
Nothing really earthshattering here. But it's funny how every time I
look closely at a site where I think string_lists could be used, I
find problems with the old code. In this case is_absolute_path() is
called with an argument that is not a null-terminated string, which is
incorrect (though harm
Change link_alt_odb_entry() to take a NUL-terminated string instead of
(char *, len). Use string_list_split_in_place() rather than inline
code in link_alt_odb_entries().
This approach saves some code and also avoids the (probably harmless)
error of passing a non-NUL-terminated string to is_absolu
47 matches
Mail list logo
