will need
the original value. Therefore, we need to be very careful only to reset
env in finish_command() when it has been initialized in start_command().
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
run-command.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/run
direction).
Interdiff vs v1 below the diffstat.
Johannes Schindelin (2):
Clean stale environment pointer in finish_command()
Add a few more options for receive.denyCurrentBranch
Documentation/config.txt | 9
builtin/receive-pack.c | 60
are:
'updateInstead':
Update the working tree accordingly, but refuse to do so if there
are any uncommitted changes.
'detachInstead':
Detach the HEAD, thereby keeping currently checked-out revision,
index and working directory unchanged.
Signed-off-by: Johannes Schindelin
Hi,
On Mon, 10 Nov 2014, Johannes Schindelin wrote:
In start_command(), unset env fields are initialized via env_array. In
finish_command(), the env_array is cleared, therefore the env field
will point to free()d data.
However, start_command() will set env to env_array.argv only if env
Hi,
On Tue, 11 Nov 2014, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I don't think this is unfortunately; freeing the memory was the entire
purpose in adding env_array. If you want to easily reuse the same
environment in multiple commands, it is still perfectly fine to use
Hi Junio,
On Mon, 10 Nov 2014, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
By the way, if the expected use case of updateInstead is what I
outlined in the previous message, would it make more sense not to
fail with update-index --refresh failure (i.e
Hi Junio,
On Mon, 10 Nov 2014, Junio C Hamano wrote:
Junio C Hamano gits...@pobox.com writes:
Dying when update-index --refresh signals a difference is an
attempt to mimic #1, but it is in line with the spirit of the reason
why a user would want to use updateInstead, I think. The
Hi Junio,
On Mon, 10 Nov 2014, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
I do not think of a good justification of detachInstead offhand, but
you must have thought things through a lot more than I did, so you
can come up with a work flow description
Hi Junio,
On Wed, 12 Nov 2014, Junio C Hamano wrote:
Instead of running update-index --refresh; read-tree -m -u, using
reset --keep may be a better implementation of what you are trying to
do here.
I do not think that `reset --keep` is what I want. I really want to update
only if the working
Hi Junio,
On Thu, 13 Nov 2014, Johannes Schindelin wrote:
Due to that experience, the documentation also states pretty clearly that
`updateInstead` succeeds only in updating the current branch if the
working directory is clean.
To clarify why `updateInstead` is stricter than the `merge
in this
developer's daily work is when trying to get a bug fix from a Windows
computer, a virtual machine or a user's machine onto his main machine (in
all of those cases it is only possible to connect via ssh in one direction,
but not in the reverse direction).
Interdiff vs v2 below the diffstat.
Johannes
.
Signed-off-by: Johannes Schindelin johannes.schinde...@gmx.de
---
Documentation/config.txt | 5
builtin/receive-pack.c | 78 ++--
t/t5516-fetch-push.sh| 17 +++
3 files changed, 98 insertions(+), 2 deletions(-)
diff --git
Hi Stefan,
On Thu, 8 Aug 2013, Stefan Beller wrote:
The condition before the changed line dereferences 'one' to query the mode,
so if the condition evaluates to true, the variable one must not be null.
To show this better, please use -U10 (or some other appropriate context
option) in the
Hi Stephen,
On Thu, 8 Aug 2013, Stephen Haberman wrote:
If a user is working on master, and has merged in their feature branch,
but now has to git pull because master moved, with pull.rebase their
feature branch will be flattened into master.
This is because git pull currently does not
Hi Stefan,
On Thu, 8 Aug 2013, Stefan Beller wrote:
So you rather propose to have
- show_submodule_summary(o-file, one ? one-path : two-path,
+ show_submodule_summary(o-file, one-path ? one-path :
two-path,
I do. The reason is that one-path could be NULL (but not
Hi Tvangeste,
On Tue, 10 Sep 2013, Tvangeste wrote:
After bisecting this problem I ended up with the mentioned commit that
completely breaks git-svn for me on Windows (mingw/msys version).
Have you tried with Git for Windows yet?
Ciao,
Johannes
--
To unsubscribe from this list: send the line
Hi Tvangeste,
On Tue, 10 Sep 2013, Tvangeste wrote:
10.09.2013, 18:13, Johannes Schindelin johannes.schinde...@gmx.de:
Have you tried with Git for Windows yet?
What's Git for Windows? If you mean msysgit,
Actually, they are two different things: Git for Windows is what the name
says
Hi,
On Wed, 17 Oct 2012, Felipe Contreras wrote:
I've looked at many hg-git tools and none satisfy me. Too complicated,
or too slow, or to difficult to setup, etc.
The one I merged into Git for Windows (since that is what I install on all
my machines even if they run Linux) is rock-solid. It
Hi,
On Wed, 17 Oct 2012, Felipe Contreras wrote:
On Wed, Oct 17, 2012 at 6:03 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On Wed, 17 Oct 2012, Felipe Contreras wrote:
I've looked at many hg-git tools and none satisfy me. Too
complicated, or too slow, or to difficult
Hi Felipe,
On Wed, 17 Oct 2012, Felipe Contreras wrote:
On Wed, Oct 17, 2012 at 8:18 PM, Sverre Rabbelier srabbel...@gmail.com
wrote:
On Wed, Oct 17, 2012 at 11:12 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
But fine, lets remove the tests out of the equation (150 lines), the
Hi Felipe,
On Thu, 18 Oct 2012, Felipe Contreras wrote:
On Thu, Oct 18, 2012 at 10:47 AM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
So your idea of collaboration is accept that your code is awesome, and
my code sucks, and that I should fix your code, and throw my code
Hi,
On Thu, 18 Oct 2012, Felipe Contreras wrote:
On Thu, Oct 18, 2012 at 8:12 AM, Sverre Rabbelier srabbel...@gmail.com
wrote:
On Wed, Oct 17, 2012 at 10:18 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
Right now I've just added an error when using remote repositories.
But it
Hi,
On Fri, 19 Oct 2012, Erik Faye-Lund wrote:
On Fri, Oct 19, 2012 at 12:13 AM, Chris B chris.blaszczyn...@gmail.com
wrote:
Hi.. it is such a crime to have that default option of MSysGit mess
around with the line endings.
No it's not.
Let's keep things professional. Eliciting
Hi Felipe,
On Sun, 21 Oct 2012, Felipe Contreras wrote:
On Thu, Oct 18, 2012 at 10:47 AM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Without push support, remote-hg is useless to me. Without regression
tests proving that it is rock solid, I will not use remote-hg.
Done
Hi Karsten,
On Thu, 30 May 2013, Karsten Blees wrote:
Am 25.05.2013 21:16, schrieb Pat Thoyts:
On that note -- with this merge as it now stands I get the following
test failures:
t0008-ignores.sh 155, 158, 162, 164
These tests fail because they use absolute
Hi Pat,
On Thu, 30 May 2013, Pat Thoyts wrote:
On 30 May 2013 16:15, Johannes Schindelin johannes.schinde...@gmx.de wrote:
On Thu, 30 May 2013, Karsten Blees wrote:
Am 25.05.2013 21:16, schrieb Pat Thoyts:
On that note -- with this merge as it now stands I get the following
test
Hi Ram,
On Fri, 7 Jun 2013, Ramkumar Ramachandra wrote:
Johannes Schindelin wrote:
My initial reaction, too. It was hard enough to get Perl included with Git
for Windows (because of that pesky Subversion dependency).
Nevertheless, we had to do it, and we did it.
That is not quite
Hi Ram,
On Sat, 8 Jun 2013, Ramkumar Ramachandra wrote:
Felipe Contreras wrote:
Also we heard from no regular/high-value reviewers that they feel
comfortable reviewing additions in Ruby.
Correction; *current* regular/high-value reviewers.
Correct. The opinions of inactive community
Hi Ram,
On Sat, 8 Jun 2013, Ramkumar Ramachandra wrote:
Felipe Contreras wrote:
While at it, why not re-evaluate the whole msysgit approach? I bet we
don't need a whole separate project just to create a Windows
installer. I've written Windows installers before, it's very easy to
do from
Hi Duy,
On Sat, 8 Jun 2013, Duy Nguyen wrote:
On Thu, Jun 6, 2013 at 11:22 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi Greg,
On Thu, 6 Jun 2013, Greg Troxel wrote:
As one of the people who helps maintain git packages in pkgsrc, my
initial reaction is negative
Hi Sebastian,
On Thu, 27 Jun 2013, Sebastian Schuberth wrote:
Call built-in commands via the main executable (non-dashed form) without
relying on the aliases (dashed form) to be present. On some platforms,
e.g. those that do not properly support file system links, it is
inconvenient to ship
Hi Sebastian,
On Fri, 28 Jun 2013, Sebastian Schuberth wrote:
On Thu, Jun 27, 2013 at 8:52 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -97,7 +97,7 @@ do
if test $? -ne 0
then
echo
Hi all,
On Mon, 29 Oct 2012, Jeff King wrote:
On Mon, Oct 29, 2012 at 10:47:04PM +0100, Felipe Contreras wrote:
Yeah, the test script is not ready for merging, it needs to check
for python, hg, and hg-git.
Do you have hg-git installed?
No. But it's important that it fail
Hi Chris,
On Tue, 30 Oct 2012, Chris Webb wrote:
I routinely work with projects in both hg and git, so I'm really
interested in this. Thanks for working on it! I grabbed the latest
version from
https://github.com/felipec/git/blob/fc-remote-hg/contrib/remote-hg/git-remote-hg
and have
Hi Felipe,
On Tue, 30 Oct 2012, Felipe Contreras wrote:
But you mentioned something about cooperation, and I've yet to see how
is it that you are planning to cooperate. If you say you don't have time
to spend on this, I don't see why I should worry about testing this
series of patches.
It
Hi Felipe,
On Tue, 30 Oct 2012, Felipe Contreras wrote:
On Tue, Oct 30, 2012 at 8:01 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Felipe Contreras wrote:
On Tue, Oct 30, 2012 at 7:47 PM, Jonathan Nieder jrnie...@gmail.com
wrote:
and in the examples listed in the patch
description
Hi Peff,
On Wed, 31 Oct 2012, Jeff King wrote:
I really like some of the directions the series is taking, and as the
maintainer, I'd like to pick it up.
Code-wise, I agree.
But there is a big question mark for me still about how it relates to
the work in msysgit, especially:
- What
Hi,
On Wed, 31 Oct 2012, Felipe Contreras wrote:
It doesn't get any more obvious than that. But to each his own.
In my opinion, Jonathan does not deserve any of such condescending words.
But maybe the Git maintainers are okay with such a tone on this list?
Hth,
Johannes
--
To unsubscribe from
Hi Peff,
On Fri, 2 Nov 2012, Jeff King wrote:
On Tue, Oct 30, 2012 at 05:37:21PM -0700, Jonathan Nieder wrote:
If the commit does not have the SHOWN or UNINTERESTING flag set but it
is going to get the UNINTERESTING flag set during the walk because of
a negative commit listed on the
Hi,
On Sun, 11 Nov 2012, Jeff King wrote:
On Sun, Nov 11, 2012 at 05:46:32PM +0100, René Scharfe wrote:
However, I couldn't reproduce it on Linux : where the windows
implementations crashes at a ~32000 depth (*not* exactly 32768, mind
you), on linux it happily went through 10
Hi Peff,
On Mon, 12 Nov 2012, Jeff King wrote:
On Mon, Nov 12, 2012 at 11:27:14PM +0100, Jean-Jacques Lafay wrote:
2012/11/11 Jeff King p...@peff.net:
On Sun, Nov 11, 2012 at 05:46:32PM +0100, René Scharfe wrote:
Ultimately, I have some ideas for doing this in a breadth-first way,
Hi Peff,
On Mon, 12 Nov 2012, Jeff King wrote:
On Tue, Nov 13, 2012 at 01:16:01AM +, Johannes Schindelin wrote:
We can do much better than O(number of commits), though, if we stop
traversing down a path when its timestamp shows that it is too old to
contain the commits we
Hi Peff,
On Mon, 12 Nov 2012, Jeff King wrote:
On Tue, Nov 13, 2012 at 04:01:11AM +, Johannes Schindelin wrote:
Note that name-rev will produce wrong answers in the face of clock skew.
And I think that you even wrote that code. :)
IIRC the cute code to short-circuit using
Hi Junio,
On Sun, 25 Nov 2012, Junio C Hamano wrote:
From: Johannes Schindelin johannes.schinde...@gmx.de
Subject: Re: [PATCH v3 4/4] fast-export: make sure refs are updated properly
Date: Fri, 2 Nov 2012 16:17:14 +0100 (CET)
Message-ID:
alpine.deb.1.00.1211021612320.7...@s15462909
Hi Junio,
On Mon, 26 Nov 2012, Junio C Hamano wrote:
Johannes Schindelin johannes.schinde...@gmx.de writes:
If you changed your stance on the patch Sverre and I sent to fix this,
we could get a non-partial fix for this.
This is long time ago so I may be misremembering the details
Hi David,
On Mon, 26 Nov 2012, David Aguilar wrote:
*cough* git-cola *cough*
If you had a couple of free cycles to help us get Python/Qt compiled in
msysGit, I will be happy to make a Git for Windows package including
git-cola.
Ciao,
Dscho
--
To unsubscribe from this list: send the line
Hi,
On Tue, 13 Nov 2012, Erik Faye-Lund wrote:
Set a control-handler to prevent the process from terminating, and
simulate SIGINT so it can be handled by a signal-handler as usual.
One thing you might want to mention is that the fgetc() handling is not
thread-safe, and intentionally so: if
Hi,
On Tue, 13 Nov 2012, Erik Faye-Lund wrote:
By moving the echo-disabling code to a separate function, we can
implement OS-specific versions of it for non-POSIX platforms.
Signed-off-by: Erik Faye-Lund kusmab...@gmail.com
---
compat/terminal.c | 43
Hi kusma,
On Tue, 13 Nov 2012, Erik Faye-Lund wrote:
The getpass-implementation we use on Windows isn't at all ideal;
it works in raw-mode (as opposed to cooked mode), and as a result
does not deal correcly with deletion, arrow-keys etc.
Instead, use cooked mode to read a line at the time,
Hi kusma,
On Tue, 13 Nov 2012, Erik Faye-Lund wrote:
There's no remaining call-sites, and as pointed out in the
previous commit message, it's not quite ideal. So let's just
lose it.
Awesome!
Dscho
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Hi kusma,
On Tue, 4 Dec 2012, Erik Faye-Lund wrote:
in ab1a11be (mingw_rmdir: set errno=ENOTEMPTY when appropriate),
a check was added to prevent us from retrying to delete a directory
that is both in use and non-empty.
However, this logic was slightly flawed; since we didn't return
Hi kusma,
On Sat, 1 Dec 2012, Erik Faye-Lund wrote:
On Fri, Nov 30, 2012 at 6:58 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi,
On Tue, 13 Nov 2012, Erik Faye-Lund wrote:
Set a control-handler to prevent the process from terminating, and
simulate SIGINT so it can
Hi kusma,
On Sat, 1 Dec 2012, Erik Faye-Lund wrote:
On Fri, Nov 30, 2012 at 6:59 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi,
On Tue, 13 Nov 2012, Erik Faye-Lund wrote:
By moving the echo-disabling code to a separate function, we can
implement OS-specific versions
Hi kusma,
On Wed, 5 Dec 2012, Erik Faye-Lund wrote:
Sorry for a late reply.
Yeah, sorry, my replies tend to be delayed a lot. For the record: your
reply was not at all late.
On Tue, Dec 4, 2012 at 5:35 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
On Tue, 4 Dec 2012, Erik
Hi kusma,
On Mon, 10 Dec 2012, Erik Faye-Lund wrote:
On Mon, Dec 10, 2012 at 5:25 PM, Junio C Hamano gits...@pobox.com wrote:
Erik Faye-Lund kusmab...@gmail.com writes:
in ab1a11be (mingw_rmdir: set errno=ENOTEMPTY when appropriate), a
check was added to prevent us from retrying to
Hi Rupert,
On Sat, 5 Jan 2013, rupert THURNER wrote:
2012/12/31 Johannes Schindelin johannes.schinde...@gmx.de:
there are 3 admins:
* https://git.wiki.kernel.org/index.php/Special:Contributions/KorgWikiSysop,
last contribution january 2010
* https://git.wiki.kernel.org/index.php
Hi Junio,
On Mon, 14 Jan 2013, Junio C Hamano wrote:
It appears that memcmp() uses the usual one word at a time
comparison and triggers valgrind in a callback of bsearch() used in
the refname search. I can easily trigger problems in any script
with test_commit (e.g. sh t0101-at-syntax.sh
Hi Ramsay,
On Thu, 31 Jan 2013, Ramsay Jones wrote:
As I mentioned recently, while discussing a cygwin specific patch
(see Version 1.8.1 does not compile on Cygwin 1.7.14 thread), the
MSVC build is broken for me.
The first 4 patches fix the MSVC build for me. The final patch is
not really
Hi Hannes,
On Mon, 25 Feb 2013, Johannes Sixt wrote:
Am 2/25/2013 7:54, schrieb Junio C Hamano:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
As I mentioned recently, while discussing a cygwin specific patch
(see Version 1.8.1 does not compile on Cygwin 1.7.14 thread), the
MSVC
Hi Karsten,
On Tue, 26 Feb 2013, Karsten Blees wrote:
@Pat, Dscho: the rebase-merge script should automatically drop patches
found in upstream, correct?
Yep, that's the idea. Under some circumstances, --cherry will fail to pick
up on it and the commits will still be marked for 'pick', but
Hi kusma,
On Thu, 14 Mar 2013, Erik Faye-Lund wrote:
Since ancient times, we have been calling curl_global_init with the
CURL_GLOBAL_ALL-flag, which initializes SSL (and the Win32 socket
stack on Windows).
Initializing SSL takes quite some time on Windows, so let's avoid
doing it when
Hi Junio,
On Thu, 14 Mar 2013, Junio C Hamano wrote:
Erik Faye-Lund kusmab...@gmail.com writes:
diff --git a/http.c b/http.c
index 3b312a8..528a736 100644
--- a/http.c
+++ b/http.c
@@ -343,7 +343,8 @@ void http_init(struct remote *remote, const char *url,
int proactive_auth)
Hi Junio,
On Thu, 14 Mar 2013, Junio C Hamano wrote:
Erik Faye-Lund kusmab...@gmail.com writes:
I wonder whether we want to have something like this instead:
flags = CURL_GLOBAL_ALL;
if (prefixcmp(url, https:))
flags = ^CURL_GLOBAL_SSL;
Hi,
On Fri, 15 Apr 2005, David Woodhouse wrote:
But if it can be done cheaply enough at a later date even though we end
up repeating ourselves, and if it can be done _well_ enough that we
shouldn't have just asked the user in the first place, then yes, OK I
agree.
The repetition could be
git-prune-script still contained that non-portable option.
Signed-off-by: Johannes Schindelin [EMAIL PROTECTED]
---
git-prune-script |2 +-
1 files changed, 1 insertion, 1 deletion
diff --git a/git-prune-script b/git-prune-script
--- a/git-prune-script
+++ b/git-prune-script
@@ -20,6
Test t6002 unnecessarily fails when bc is a bit older than average.
Signed-off-by: Johannes.Schindelin [EMAIL PROTECTED]
---
t/t6002-rev-list-bisect.sh |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
ccea5a568914eafc07caf0c291afe5f962672cd3
diff --git
Hi,
On Thu, 28 Jul 2005, Petr Baudis wrote:
Dear diary, on Thu, Jul 28, 2005 at 03:07:01PM CEST, I got a letter
where Johannes Schindelin [EMAIL PROTECTED] told me that...
On Thu, 28 Jul 2005, Petr Baudis wrote:
See above. I would much rather see more flexible git-send-pack. Junio
Hi,
On Thu, 28 Jul 2005, Matthias Urlichs wrote:
Hi, Johannes Schindelin wrote:
Since git is better than all of these, we should be able to easily write a
SVN-like porcelain, so ... ;-)
Sorry, you're correct.
IMHO, if you need a central repository, you should also have
one central HEAD
Hi,
On Thu, 28 Jul 2005, Junio C Hamano wrote:
Johannes Schindelin [EMAIL PROTECTED] writes:
Some newer features of libcurl are used which are not strictly necessary
for http-pull. Use them only if libcurl is new enough to know about them.
Do you need to check against that many versions
I like it!
Ciao,
Dscho
-
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
Hi,
On Thu, 28 Jul 2005, Junio C Hamano wrote:
While I agree there should be a graceful way to go back to the
original head from a failed merge situation, I do not think
committing the current HEAD is the right model for the end
user to think about it.
Wouldn't using checkout -f to revert
Hi,
On Fri, 29 Jul 2005, Petr Baudis wrote:
Dear diary, on Fri, Jul 29, 2005 at 12:57:50PM CEST, I got a letter
where Johannes Schindelin [EMAIL PROTECTED] told me that...
git-switch-tree remotehead
git-merge master
git-push remoteside remotehead
which would have
Hi,
is it possible that you forgot to initialize commit_graft_nr to 0?
Ciao,
Dscho
-
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
Hi,
I tried to avoid the work. But I'll do it.
Ciao,
Dscho
-
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
Hi,
On Sun, 31 Jul 2005, Junio C Hamano wrote:
Let's yank out the update_server_info() call when Josef's patch
can handle a single hook call at the end of the run, in addition
to one call per each ref getting updated.
How about executing update_server_info() if no hook was found? That way,
Describe core git, not cogito.
Tell something about emulating the CVS work flow.
Fix small typos.
Signed-off-by: Johannes Schindelin [EMAIL PROTECTED]
---
Documentation/cvs-migration.txt | 28 ++--
1 files changed, 22 insertions(+), 6 deletions
Fix a few typos.
Adapt to git-http-pull not borking on packed repositories.
Signed-off-by: Johannes Schindelin [EMAIL PROTECTED]
---
Documentation/tutorial.txt | 36 +---
1 files changed, 17 insertions(+), 19 deletions
Hi,
do you mean git-prune-script? It is documented in
Documentation/git-prune-script.txt.
Ciao,
Dscho
-
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
Hi,
there's git-check-files in the repository, but AFAIK nobody uses it, not
even git status, which would be the primary candidate. If really no
users of git-check-files exist, maybe we should remove it?
Ciao,
Dscho
-
To unsubscribe from this list: send the line unsubscribe git in
the body
Hi,
On Wed, 3 Aug 2005, Junio C Hamano wrote:
Sorry, you have not lost anything. It is my bad that this is
the first time I brought it up. I've been seeing that from time
to time when I push to either my send to master repository
from my working repository, or from the send to master
Hi,
On Wed, 3 Aug 2005, Linus Torvalds wrote:
Are you sure you have a good git version on master? I've never seen
anything like that, and I push all the time..
Call him Zaphod: he has two heads (master and pu). You don't. As I said in
another mail, this could be very well related to Junio's
Hi,
On Tue, 2 Aug 2005, Junio C Hamano wrote:
This may be controversial from the robustness standpoint, so I
am placing it in the proposed update queue first. Discussions
on the list very welcomed.
I'd vote against it: As of now, I can perfectly do
export PATH=$PATH:/whereever/my/git/is
Hi,
On Thu, 4 Aug 2005, Junio C Hamano wrote:
Johannes Schindelin [EMAIL PROTECTED] writes:
This may be controversial from the robustness standpoint, so I
am placing it in the proposed update queue first. Discussions
on the list very welcomed.
I'd vote against it: As of now, I can
Hi,
I just tried to clone a relatively big repository from a slow machine to a
slow machine. I'm talking about a 1.2 gigabyte repository, packed down to
120 megabyte, containing more than 21000 commits. When git-clone-script
did not show anything for over 15 minutes, I decided to find out
Hi,
On Thu, 4 Aug 2005, Junio C Hamano wrote:
I will keep git-rev-list; used in Jeff's git-changes-script and
some parts of Cogito as well.
According to my grep's, these files use git-rev-list:
git-bisect-script
git-cherry
git-format-patch-script
git-log-script
git-repack-script
Hi,
On Thu, 4 Aug 2005, Junio C Hamano wrote:
Oh, I see. Then the templates/Makefile building into
templates/blt and then installing if you say make install
approach I described earlier would hopefully work perfectly well
for you. Just like you tack the $src to your $PATH, you can
define
Hi,
I am finally finished with my preliminary survey: I took what you sent as
a strawman, and inserted what I found (I tried to say only something about
ambiguous naming):
- The unit of storage in GIT is called object; no other word
is used and the word object is used only for this
Hi,
while sifting through the documentation to find different namings for the
same concepts, I saw a few things here and there, which I fixed. Since the
sifting was quite numbing, there might be some wrong fixes.
Sorry, patch is attached, because I still can't convince my pine (version
Hi,
On Fri, 5 Aug 2005, [EMAIL PROTECTED] wrote:
On Fri, 5 Aug 2005, Linus Torvalds wrote:
On Fri, 5 Aug 2005, Johannes Schindelin wrote:
- The files under $GIT_DIR/refs record object names, and are
called refs. What is under refs/heads/ are called heads,
refs/tags
Hi,
wow! What a long mail! But I probably deserved it, quoting that lengthy
mail from Junio...
On Fri, 5 Aug 2005, Linus Torvalds wrote:
On Fri, 5 Aug 2005, Johannes Schindelin wrote:
Tutorial says cache aka index. Though technically, a cache
is the index file _plus_ the related
Hi,
On Fri, 5 Aug 2005, Linus Torvalds wrote:
On Fri, 5 Aug 2005, Junio C Hamano wrote:
- Teach fetch-pack reference renaming.
Well, the fetch side at least needs it less.
Right now the renaming means that you can only really fetch _one_ head at
a time, but that's at least a fairly
Hi,
On Sun, 7 Aug 2005, Junio C Hamano wrote:
I hear a lot of people mention $GIT_DIR/branches/ is confusing.
Maybe we should rename it to $GIT_DIR/remote/ directory?
I'd prefer $GIT_DIR/remotes/. And I propose another extension: Since the
files stored therein right now contain only one
Hi,
On Sun, 7 Aug 2005, Junio C Hamano wrote:
$ git commit -m ORIG_HEAD
Since there are not many users of git-commit's *-m* flag right now: Is it
necessary to confuse CVS people, who expect to be able to write
git commit -m I did this and that
I do not want to be too intrusive,
Hi,
On Mon, 8 Aug 2005, Johannes Schindelin wrote:
Hi,
On Sun, 7 Aug 2005, Junio C Hamano wrote:
$ git commit -m ORIG_HEAD
Since there are not many users of git-commit's *-m* flag right now: Is it
necessary to confuse CVS people, who expect to be able to write
git
Hi,
On Mon, 8 Aug 2005, Josef Weidendorfer wrote:
IMHO, $GIT_DIR/branches/ is really confusing.
Hmmm... in $GIT_DIR/branches/ there are named references to remote (named)
references.
Not necessarily. The following is perfectly valid:
echo rsync://rsync.kernel.org/pub/scm/git/git.git
Hi list,
I mentioned in another mail that I needed the opposite of git-push, namely
getting all heads, and if they are strict parents of the local refs, just
update them.
Well, Junio pointed out that it's easy using the available tools, and he
was right. The result is attached (and
Hi,
On Mon, 8 Aug 2005, Junio C Hamano wrote:
* git commit does not take commit message from stdin. I think
we should do something like this:
[...]
And could we rename the *-m* flag at the same time? Because I often catch
myself typing
git commit -m Some_commit_message
Ciao,
Hi,
On Mon, 8 Aug 2005, Ryan Anderson wrote:
[...]
We should discuss (or just do) a reorganization of how we lay out the
source tree.
[...]
I, for one, like the layout. There are not yet enough files to merit a
hierarchy, and what's more: I can add the source-directory to my PATH and
be
Hi,
On Mon, 8 Aug 2005, Junio C Hamano wrote:
Linus Torvalds [EMAIL PROTECTED] writes:
Or if you want to be more CVS-like, use -F, and accept - for stdin?
Yes my vote goes:
-m message
-c from this commit, literally.
-C from this commit, but let me edit the log
[PATCH] Adapt git-cherry and git-rebase-script to latest changes of git commit
Teach git-cherry and git-rebase-script to use the -c option, since
-m means something different to git-commit-script now.
Signed-off-by: Johannes Schindelin [EMAIL PROTECTED]
---
git-cherry|2 +-
git
101 - 200 of 5954 matches
Mail list logo
