adding a command that allows such a resolution?
Cheers,
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 18, 2014 at 09:34:26AM +0900, Mike Hommey wrote:
Hi,
For some reason, I need to know the sha1 corresponding to some marks
I'm putting in a fast-import stream. Unfortunately, this does not appear
to be possible.
- I'd rather not require a checkpoint to export marks each time I
On Mon, Nov 17, 2014 at 05:40:28PM -0800, Jonathan Nieder wrote:
Mike Hommey wrote:
- fast-import's `ls` command documentation about its output format
mentions that the output may contain commits, so I tried the trick of
creating a tree with commits, but fast-import then fails
On Tue, Nov 18, 2014 at 11:21:37AM +0900, Mike Hommey wrote:
On Tue, Nov 18, 2014 at 09:34:26AM +0900, Mike Hommey wrote:
Hi,
For some reason, I need to know the sha1 corresponding to some marks
I'm putting in a fast-import stream. Unfortunately, this does not appear
to be possible
On Mon, Nov 17, 2014 at 06:51:31PM -0800, Jonathan Nieder wrote:
Mike Hommey wrote:
On Mon, Nov 17, 2014 at 05:40:28PM -0800, Jonathan Nieder wrote:
How did you get that Not a blob message?
When trying to *create* a tree with a commit in it, so instead of giving
the mark for a blob
On Mon, Nov 17, 2014 at 06:53:59PM -0800, Jonathan Nieder wrote:
Mike Hommey wrote:
BTW, if it so happens that all the operations that were done end up
creating objects that already existed for some reason, checkpoint
doesn't do anything, which is fine for the pack and tags
On Mon, Nov 17, 2014 at 07:27:41PM -0800, Jonathan Nieder wrote:
Mike Hommey wrote:
And while I'm here, it's sad that one needs to emit a dummy cat-blob or
ls command to wait for a checkpoint to be finished
That's a good point. (Though relying on checkpoints to read back
information
listed bug doesn't reproduce on Mac OS Yosemite or Mavericks. For now,
just enable TTY on Mavericks and higher
Signed-off-by: Mike Blume blume.m...@gmail.com
Improved-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Junio C Hamano gits...@pobox.com
Improved-by: John Szakmeister j
TTY tests were previously skipped on all Mac OS systems because of a
bug where reading from pty master occasionally hung. This bug has since
been found not to be reproducible under Mac OS 10.9 and 10.10.1.
Therefore, run TTY tests under Mac OS 10.9 (Mavericks) and higher.
Signed-off-by: Mike
listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable
TTY on Yosemite and higher
Signed-off-by: Mike Blume blume.m...@gmail.com
---
t/lib-terminal.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/lib-terminal.sh b/t/lib-terminal.sh
index 5184549
listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable
TTY on Yosemite and higher
Signed-off-by: Mike Blume blume.m...@gmail.com
Improved-by: Junio C Hamano gits...@pobox.com
---
t/lib-terminal.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/lib
Sent from my BlackBerry 10 smartphone on the Rogers network.
Original Message
From: René Scharfe
Sent: Tuesday, October 28, 2014 16:59
To: Git Mailing List
Cc: Junio C Hamano
Subject: [PATCH] use child_process_init() to initialize struct child_process
variables
Call child_process_init()
[ sorry for the dup ]
Begin forwarded message:
On Aug 6, 2014, at 12:44 PM, Nico Williams n...@cryptonector.com wrote:
It's not a good idea to rebase a branch in a repo that others pull from.
Well, so rebase is then out, as I don’t want to rebase _my_ tree, I want to
rebase _the_ tree.
On Aug 6, 2014, at 10:11 PM, Nico Williams n...@cryptonector.com wrote:
Nah. Sun managed this for decades without a hitch, and for products
much larger than GCC. See above.
Ok. Ah, ok, perfect. I see how that method of working would cure the
cherry-pick and merge don’t work problem
On Aug 6, 2014, at 8:43 AM, Jakub Narębski jna...@gmail.com wrote:
I gave a solution for git using branches and it works just fine. It
retains the simple 3-point merge as well.
It works for this simple case, but I think it has unfortunate potential
to go silently wrong.
That just means
On Aug 1, 2014, at 4:40 PM, Nico Williams n...@cryptonector.com wrote:
As for rebase, I still don't understand why it doesn't work for you.
http://git-scm.com/docs/git-rebase says:
Rebasing (or any other form of rewriting) a branch that others have based
work on is a bad idea
If you read
On Jul 31, 2014, at 7:43 PM, brian m. carlson sand...@crustytoothpaste.net
wrote:
You're not the first person to be surprised by the way merge works.
I’m not the first, because the merge command is broken. Once fixed, I would be
happy to be the last. Until then, the bug remains unfixed.
On Aug 1, 2014, at 9:27 AM, Jakub Narębski jna...@gmail.com wrote:
Note that you should try to avoid cherry-picking, as they do not
leave trace in the graph of revisions.
Fine, then I want a new command to merge in a change into my branch from
another branch and I want merge to account for
On Aug 1, 2014, at 12:22 PM, Nico Williams n...@cryptonector.com wrote:
If you always rebase
I can’t use rebase unless you make rebase work with multiple users and pushing
pulling.--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Aug 1, 2014, at 11:57 AM, Philip Oakley philipoak...@iee.org wrote:
But that goes both ways, and is a philosophical issue about what is to be
expected in various cases.
The problem is, users expect merge to merge. There isn’t a user that expects
it to scramble the source code, because the
On Aug 1, 2014, at 12:01 PM, Jakub Narębski jna...@gmail.com wrote:
It can work in Subversion because Subversion stores information about
what was merged in (and this includes cherry-picks, or whatever it is
named in svn) in svn:mergeinfo property. Git does not track what was
merged in,
On Aug 1, 2014, at 1:02 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Do you mean that git merge should be aware of what changes you have
already cherry-picked?
Yes, it amounts to that.
It isn't, and that's deliberate
Deliberate bugs are still bugs. In time, users will either wear you
On Aug 1, 2014, at 1:12 PM, Sam Vilain s...@vilain.net wrote:
Git merge has a notion of discrete merge strategies”.
There's no particular reason that you couldn't implement a merge
strategy which works more like SVN's approach, which essentially does an
internal rebase and then commits the
On Aug 1, 2014, at 1:50 PM, Jonathan Nieder jrnie...@gmail.com wrote:
And on the other hand a one-patch-at-a-time merge would
try to apply X (with no effect, since it's already applied)
and then try to apply the revert of X. The net effect would
be to revert X from
Cherry picking doesn’t work as well as it should. I was testing on git version
1.7.9.5.
Put in a line in a file, call it:
first version
then cherry pick this into your branch. Then update on master and transform
that into:
second version
then, merge that branch back to master. Death in
On Tue, Apr 01, 2014 at 07:45:03AM -0400, Jeff King wrote:
On Tue, Apr 01, 2014 at 07:25:54PM +0900, Mike Hommey wrote:
I am currently prototyping a native mercurial remote handler for git,
For my own curiosity, how does this differ from what is in
contrib/remote-helpers/git-remote-hg
. Not exactly hard, but when
everything else in fast-import is straightforward, one has to wonder.
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 01, 2014 at 10:14:02AM -0700, Junio C Hamano wrote:
Mike Hommey m...@glandium.org writes:
On Tue, Apr 01, 2014 at 09:15:12AM -0400, Jeff King wrote:
It seems to me fast-import keeps a kind of human readable format for its
protocol, i wonder if xdelta format would fit
started the thread by asking if there would be some
interest for this feature. I'm not even sure it would be entirely
beneficial to my usecase, just a hunch.
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
On Wed, Apr 02, 2014 at 01:29:13AM +0200, Max Horn wrote:
On 01.04.2014, at 15:15, Jeff King p...@peff.net wrote:
On Tue, Apr 01, 2014 at 10:07:03PM +0900, Mike Hommey wrote:
For my own curiosity, how does this differ from what is in
contrib/remote-helpers/git-remote-hg?
contrib
On Tue, Feb 18, 2014 at 10:04:54AM +0100, Erik Faye-Lund wrote:
It's right here: https://github.com/msysgit/msysgit/pull/159
You probably looked in our git repo rather than our msysGit repo.
Oh indeed I was, thanks.
Mike
--
To unsubscribe from this list: send the line unsubscribe git
went to github and... couldn't find any
pull request above #126.
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Feb 13, 2014 at 07:04:02AM +0100, David Kastrup wrote:
Mike Hommey m...@glandium.org writes:
On Wed, Feb 12, 2014 at 08:15:24PM +0100, David Kastrup wrote:
Stefan Zager sza...@chromium.org writes:
On Wed, Feb 12, 2014 at 10:50 AM, David Kastrup d...@gnu.org wrote:
Really
On Thu, Feb 13, 2014 at 06:34:39PM +0900, Mike Hommey wrote:
On Thu, Feb 13, 2014 at 07:04:02AM +0100, David Kastrup wrote:
Mike Hommey m...@glandium.org writes:
On Wed, Feb 12, 2014 at 08:15:24PM +0100, David Kastrup wrote:
Stefan Zager sza...@chromium.org writes:
On Wed, Feb
mostly for big, bad
files on Windows: other than that, the I/O time is likely to be the
dominant player anyway.
How much fragmentation does that add to the files, though?
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
to
keep fscache up to date, as it _may_ report DOS file names (e.g. C:\PROGRA~1
instead of C:\Program Files).
You can use GetLongPathNameW to get the latter from the former.
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
option to make git use the file-watcher *and* normal lstat
operations, to check consistency.
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
. That would work properly on unix too.
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
with the same git sha1s. Mercurial easily allows
author dates to be in a non topological order.
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 30, 2013 at 08:41:13AM +0100, Antoine Pelisse wrote:
On Sun, Dec 29, 2013 at 11:24 PM, Mike Hommey m...@glandium.org wrote:
On Sun, Dec 29, 2013 at 12:30:02PM +0100, Antoine Pelisse wrote:
Mercurial can have bookmarks pointing to nullid (the empty root
revision), while Git can
-remote-hg will not be able to
create the corresponding reference.
Warn the user about the invalid reference, and continue the import,
instead of stopping right away.
It's not invalid, it's used to indicate deleted bookmarks. (Tags have
the same property)
Mike
--
To unsubscribe from this list
Only consider the first parent commit when walking the commit history. This
is useful if you only wish to match tags on your branch after a merge.
Signed-off-by: Mike Crowe m...@mcrowe.com
---
Documentation/git-describe.txt | 9 -
builtin/describe.c | 5 +
t/t6120
On Fri, May 17, 2013 at 04:03:29PM +0100, John Keeping wrote:
On Fri, May 17, 2013 at 03:24:26PM +0100, Mike Crowe wrote:
Only consider the first parent commit when walking the commit history. This
is useful if you only wish to match tags on your branch after a merge.
For consistency
settings have been there for so long that I thought it was the
default.
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
, that's enough of a hint to anyone setting the thing up, no
need to write paragraphs of legal-beagle boiler-plate for dinky bug;)
-Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http
Tested, original setup works fine.
On Fri, 2013-04-12 at 14:03 -0700, Jonathan Nieder wrote:
The changes v1.7.12.1~2^2~4 (config: warn on inaccessible files,
2012-08-21) and v1.8.1.1~22^2~2 (config: treat user and xdg config
permission problems as errors, 2012-10-13) were intended to prevent
On Thu, 2013-04-11 at 01:42 -0400, Jeff King wrote:
On Thu, Apr 11, 2013 at 05:39:43AM +0200, Mike Galbraith wrote:
ALLOWED_ENV=PATH HOME
HOME=/
I can work around it by changing the init script to use su - git -c bla
bla to launch the thing, instead of using --user=git --group
ain't gonna work.
-Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2013-04-10 at 09:56 -0400, W. Trevor King wrote:
On Wed, Apr 10, 2013 at 07:33:35AM +0200, Mike Galbraith wrote:
/usr/lib/git/git-daemon --syslog --detach --reuseaddr --user=git
--group=daemon --pid-file=/var/run/git-daemon.pid --export-all --user-path
--enable=receive-pack
-existent config file terminal.
-Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
) = ?
I'm afraid that I don't know enough about Git's internals to understand why
it decided to look at the pack files and rebuild the index but it seems
that if this happens the exit status is correct. :(
(Full straces available on request by private email if required.)
Mike
Is there a point to the version checking? I don't know that anyone
has tried to build Git on QNX 4, so adding a case for it seems
misleading.
getpagesize() was introduced in QNX 6.4.1, it is present in QNX 6.5.0
also. So at least for this version checking is requied.
I didn't realize that
I saw Matt has comment on this patch, so I'll keep the patch out of
'next' for now and let you two figure it out.
Anyway in current form this patch is broken. Junio, may I ask you
about the rest patches in a separate posts, have you applied any of
them?
Thanks.
--
To unsubscribe from this
I don't think it's a good idea to just enable thread support. On QNX,
once a process creates a thread, fork stops working. This breaks
commands that create threads and then try to run other programs, such
as git fetch with an https remote. If threads are enabled, I think
that the uses of
The test does _not_ fail. That if condition does return -1 on Linux
and BSD, and making tm_to_time_t() return a failure, but the caller
goes on, ending up with the right values in year/month/date in the
tm struct, which is the primary thing the function is used for.
I said it wrong, test
If I remove the call to pthread_create, it doesn't output anything and
exits successfully.
I see. Most resource managers use procmgr_daemon(), which has no such
limitation. Anyway, as far as I can see current git sources do not use
fork together with pthread, except for daemonize() function.
--
Hi Junio,
Swapping the order between CFLAGS and BASIC_CFLAGS in ALL_CFLAGS may
be a good change for that reason as well.
This sounds very reasonable.
In any case, I won't take a patch to rename source files left and
right only to work around name collisions with random system header
files
Fix is_date() function failings in detection of correct date in case
if time was not properly initialized.
From: Mike Gorchak mike.gorchak@gmail.com
Signed-off-by: Mike Gorchak mike.gorchak@gmail.com
---
date.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff
Add pthread support in QNX. Do not declare NO_ macros if they can be
autodetected.
From: Mike Gorchak mike.gorchak@gmail.com
Signed-off-by: Mike Gorchak mike.gorchak@gmail.com
---
config.mak.uname | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git
Also, please leave the autodetection out. If it is common to have
strcasestr (or any other) on a newer QNX, then not defining the
symbol NO_STRCASESTR in this file may still be the right thing to
do, but the justification for such a change should not be because we
rely on autodetection. The
Add detection of getpagesize() function in libc. Declare
empty NO_GETPAGESIZE macro in case if getpagesize()
exists and NO_GETPAGESIZE=YesPlease if no.
Signed-off-by: Mike Gorchak mike.gorchak@gmail.com
---
configure.ac | 5 +
1 file changed, 5 insertions(+)
diff --git a/configure.ac b
Fix is_date() function failings in detection of correct date in case
if time was not properly initialized.
Please explain why this patch is needed and what problem this patch
is trying to fix (if any) a bit better in the proposed log message.
For example, on what input do we call this
The thing that puzzles me is that nobody reported that the following
fail on their platforms (and they do not fail for me on platforms I
have to test in my real/virtual boxes).
Ok, check_parse calls function parse_date(), it calls
parse_date_basic(), where following code is present:
So is_date() always return negative result for the text string where
date is placed before time like '2008-02-14 20:30:45'.
Yes, it returns this -1 on other platforms, but...
It must fail on
other platforms as well.
It also fails under Linux, but real problem is not here, it is just an
Do not compare time_t (less comparison) with -1. If time_t
is unsigned this leads to always true comparison.
Signed-off-by: Mike Gorchak mike.gorchak@gmail.com
---
date.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/date.c b/date.c
index 57331ed..1ac28e5 100644
Fix time offset calculation expression in case if time_t
is unsigned. This code works fine for signed and
unsigned time_t.
Signed-off-by: Mike Gorchak mike.gorchak@gmail.com
---
date.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/date.c b/date.c
index
2) Rename fnmatch.h to fnmatch_gnu.h and fnmatch.c to fnmatch_gnu.c to
avoid inclusion of system fnmatch.h header in case if -I/usr/include
path is specified before -Icompat/fnmatch. Which is common situation.
As to the substance, I am fairly negative about the approach this
patch takes,
Fix git compilation without available libiconv library.
From: Mike Gorchak mike.gorchak@gmail.com
Signed-off-by: Mike Gorchak mike.gorchak@gmail.com
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 1991258..d0e82c1
Hi,
Here is a small patch with QNX build improvements:
1) Rename tar.h to tar_git.h. Latest QNX versions have system tar.h
header according to
http://pubs.opengroup.org/onlinepubs/009696699/basedefs/tar.h.html ,
to avoid inclusion of another tar.h, original header was renamed.
2) Rename
Hello,
Here is a small patch with QNX build improvements:
1) Rename tar.h to tar_git.h. Latest QNX versions have system tar.h
header according to
http://pubs.opengroup.org/onlinepubs/009696699/basedefs/tar.h.html ,
to avoid inclusion of another tar.h, original header was renamed.
2) Rename
to change the
spell check program to be used(can't find in documentation or version
of code that I'm currently installing), or would someone consider this
as a future program change?
Thanks for your time.
Mike Hall--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
Not seen any recently. I'm guessing the dev is in the path of
hurricane Sandy? (Not sarcasm, btw.)
On Tue, Oct 30, 2012 at 1:04 AM, Kevin i...@ikke.info wrote:
Any follow-up on this?
On Tue, Oct 23, 2012 at 7:11 AM, Scott Chacon scha...@gmail.com wrote:
So, this is due to the major AWS
I just checked and the issue seems to be fixed! Clicked around on a
bunch of previously broken links and they work!
On Tue, Oct 30, 2012 at 3:38 AM, Holger Hellmuth (IKS)
hellm...@ira.uka.de wrote:
Am 30.10.2012 09:07, schrieb Mike Norman:
Not seen any recently. I'm guessing the dev
* Use a more appropriate internal directory (e.g. .git/hg/origin)
* Fixes for python3
Are the resulting commits identical to what you'd get from using hg-git?
Mike
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo
!
Mike Juba
425 North Prince Street
Lancaster, PA 17603
(888)690-2152
We don't currently plan on emailing you again, but if you'd like to unsubscribe
from any further emails, please visit our unsubscribe link at
rankpop.com/email-unsubscribe/
--
To unsubscribe from this list: send the line
helpful because it
doesn't store any information about that, and I have to check again if
that's an actual conflict to solve or a patch to skip again.
It would be helpful if there was a rebase --skip mode that would tell
rerere to record that the resolution *is* --skip.
Mike
--
To unsubscribe from
k-h
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Mike Taht
New systems generate new problems.
-
To unsubscribe from this list: send the line unsubscribe git
variety in the best/worst case timings for I/O for the
compressor=3 case...
16.79user 6.15system 1:21.92elapsed 28%CPU
16.68user 5.71system 1:13.19elapsed 30%CPU
--
Mike Taht
lastly -
Timings of git commit with tmpfs (note, these were done with an ancient,
5 hour old version of git and the script
Just to clarify this was a git add of the linux-2.6.11.7 sources (sorry,
untimed) , and timing the git commit.
Mo betta data latah.
Mike Taht wrote:
I started rolling a tool to measure various aspects of git performance.
I will start looking at merge next, and at workloads different from
, GIT_COMPRESSION);
/*
* ASCII size + nul byte
Mike Taht wrote:
Just to clarify this was a git add of the linux-2.6.11.7 sources (sorry,
untimed) , and timing the git commit.
Mo betta data latah.
Mike Taht wrote:
I started rolling a tool to measure various aspects of git
performance
it.
If you don't want it, I won't do it. Still makes sense to separate the
plumbing from the porcelain, though.
--
Mike Taht
You can tell how far we have to go, when FORTRAN is the language of
supercomputers.
-- Steven Feiner
-
To unsubscribe from this list: send the line unsubscribe git
to), and
makes a tarball of ??/??
files. The tarball does not have to contain any extra
information to reproduce any ancestor of the named commit.
alternatively, git-archive-torrent to create a list of files for a
bittorrent feed
--
Mike Taht
-
To unsubscribe
commit b0550573055abcf8ad19dcb8a036c32dd00a3be4
tree b77882b170769c07732381b9f19ff2dd5c9f1520
parent 866b4aea9313513612f2b0d66814a2f526d17f21
author Mike Taht [EMAIL PROTECTED] 1113704772 -0700
committer Mike Taht [EMAIL PROTECTED] 1113704772 -0700
looks my 1878 line patch to convert git to libgit
Fixed.
Randy.Dunlap wrote:
On Sat, 16 Apr 2005 20:12:56 -0700 Mike Taht wrote:
| commit b0550573055abcf8ad19dcb8a036c32dd00a3be4
| tree b77882b170769c07732381b9f19ff2dd5c9f1520
| parent 866b4aea9313513612f2b0d66814a2f526d17f21
| author Mike Taht [EMAIL PROTECTED] 1113704772 -0700
| committer Mike
401 - 484 of 484 matches
Mail list logo
