Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 3130b23..c9d7636 100755
---
If we refuse a branch operation because the tracking
start_name the user gave us is bogus, we just print
something like:
fatal: Cannot setup tracking information; start point is not a branch
If we mention the actual name we tried to use, that may help
the user figure out why it didn't work
If the user requests to --set-upstream-to a branch that does
not exist, then either:
1. It was a typo.
2. They thought the branch should exist.
In case (1), there is not much we can do beyond showing the
name we tried to use. For case (2), though, we can help to
guide them through common
On Tue, Apr 02, 2013 at 11:06:28AM -0700, Junio C Hamano wrote:
Neil Horman nhor...@tuxdriver.com writes:
I've recently started looking into the possibility of having git support
multiple in-progress sequencers, and wanted to solicit opinions for how
best to
do it The thoughts
Garrett Cooper wrote:
I push the branch to origin/ and then things tend to work, but since
I obviously had been doing things wrong what's the correct order of
operations for creating a branch and setting the upstream
appropriately?
git push -u origin pjdfstest-onefs
Thanks for a useful
Jonathan Nieder jrnie...@gmail.com writes:
..., but it might make sense to start respecting a .motd file to allow
the following in a hypothetical world where everyone who clones git
uses the same scripts Junio does:
$ git clone git://repo.or.cz/git.git
Cloning into 'git'...
Jonathan Nieder wrote:
That sounds similar to what Junio does with the Meta subdirectory in
his git development worktree. I don't think submodules are a good
fit, but it might make sense to start respecting a .motd file to allow
the following in a hypothetical world where everyone who clones
On Tue, Apr 02, 2013 at 10:16:55AM -0700, Junio C Hamano wrote:
Yes, but as I explained later, the meaning of apply an attribute to
dir in such cases is always equivalent to apply attribute
recursively to dir/*. So I do not think we are violating that rule to
recursively apply all
Am 02.04.2013 12:31, schrieb Felipe Contreras:
And persistent_waitpid() to recover the information from the last run.
I'm not a fan of this new API, because it looks like a workaround
for a problem that should have been solved in a cleaner way. But if
we can't avoid it, please also add a
Johannes Sixt j...@kdbg.org writes:
Does the three-way merge machinery replay recorded resolution for
such a binary file correctly (after your fix, that is)?
Yes, it does. It recognizes the binary-ness and picks 'our' side. Only
then comes rerere_mem_getline into play.
Surely getline()
Seth Robertson wrote:
In message
CALkWK0=csuawqwk5guf0pbc4_zeoziwqpamcrvbgz5lj0qg...@mail.gmail.com,
Ramkumar Ramachandra writes:
As a user inexperienced with recursive submodules (I've only used them
in this repository), I found it highly confusing. Thanks for clearing
them
Ramkumar Ramachandra wrote:
Jonathan Nieder wrote:
$ git clone git://repo.or.cz/git.git
[...]
Don't forget to git clone -b todo git://repo.or.cz/git.git git/Meta
for maintenance scripts.
$
Nope, it's not mandatory for everyone to use dotfiles.git in exactly
On Tue, Apr 02, 2013 at 06:54:40PM +0300, Mikko Rapeli wrote:
I have a problem with git (1.7.9 and 1.8.2.357.gcc3e4eb) and https transport
to gerrit server (2.5.1-3-g719dfc7). I'm producing the problem on Cygwin but
my
colleagues have same issue on Linux as well.
Gerrit server is matching
Jonathan Nieder wrote:
Ramkumar Ramachandra wrote:
Jonathan Nieder wrote:
$ git clone git://repo.or.cz/git.git
[...]
Don't forget to git clone -b todo git://repo.or.cz/git.git
git/Meta
for maintenance scripts.
$
Nope, it's not mandatory for everyone to
Jeff King wrote:
I'm happy to make my dump available to anyone who wants it, but it's
kind of big (about 1.4G uncompressed).
Thanks. Can you put it up publicly somewhere (Dropbox comes to mind),
and send me a link?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of
Am 02.04.2013 21:18, schrieb Junio C Hamano:
Johannes Sixt j...@kdbg.org writes:
Does the three-way merge machinery replay recorded resolution for
such a binary file correctly (after your fix, that is)?
Yes, it does. It recognizes the binary-ness and picks 'our' side. Only
then comes
On Tue, Apr 2, 2013 at 12:03 PM, Jeff King p...@peff.net wrote:
This message is duplicated, and is quite long. Let's factor
it out, which avoids the repetition and the long lines. It
will also make future patches easier as we tweak the
message.
While we're at it, let's also mark it for
On Tue, Apr 2, 2013 at 12:36 PM, Garrett Cooper yaneurab...@gmail.com wrote:
On Tue, Apr 2, 2013 at 12:03 PM, Jeff King p...@peff.net wrote:
This message is duplicated, and is quite long. Let's factor
it out, which avoids the repetition and the long lines. It
will also make future patches
On Tue, Apr 2, 2013 at 12:04 PM, Jeff King p...@peff.net wrote:
If we refuse a branch operation because the tracking
start_name the user gave us is bogus, we just print
something like:
fatal: Cannot setup tracking information; start point is not a branch
If we mention the actual name we
On Tue, Apr 02, 2013 at 03:28:45PM -0400, Jeff King wrote:
We get redirected somewhere where we provide the (presumably wrong)
credential again. I do not think that is git's fault; the server asked
us to make the extra request. Is that part of the lockout procedure? If
it is not, it seems odd
Ramkumar Ramachandra wrote:
What will I be merging and rebasing? One configuration file stuffed
with miscellaneous repositories. Don't you think this is highly
unpleasant?
I spoke too fast. Isn't that exactly what we do with .gitmodules
today (I'm not saying it's ideal, but I can't think of
I've been playing with Clang's undefined behaviour sanitizer, which
points out a few potential issues in Git when running the test suite
(it's a runtime analysis that is compiled in by setting suitable
CFLAGS).
These patches fix one issue that I think we need to worry about and one
that's trivial
When the source file is empty, the calculation of the merge score
results in a division by zero. Since the merge score is initialized to
zero, it makes sense to just leave it as it is if the source size is
zero. This means that we still use the extent of damage metric to
decide whether to break
Signed-off-by: John Keeping j...@keeping.me.uk
---
bisect.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bisect.c b/bisect.c
index bd1b7b5..0d33c6f 100644
--- a/bisect.c
+++ b/bisect.c
@@ -526,7 +526,7 @@ struct commit_list *filter_skipped(struct commit_list *list,
* for
Felipe Contreras felipe.contre...@gmail.com writes:
Here is the next round of patches for remote-hg, some which have been
contributed through github.
Thanks.
Fortunately it seems to be working for the most part, but there are some
considerable issues while pushing branches and tags.
Do you
Am 02.04.2013 19:44, schrieb Ramkumar Ramachandra:
Jonathan Nieder wrote:
Elated is probably not the right word. More annoyed at being told
their work is ugly without an accompanying concrete and actionable bug
report. :)
If I had an actionable report, I'd have started hammering patches
Felipe Contreras felipe.contre...@gmail.com writes:
We can't use stdout for that in remote helpers.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
You may want to clarify buggy output a bit. Will mercurial
forever be broken? Some versions of Hg emit [[[it is unclear for
Am 02.04.2013 20:35, schrieb Ramkumar Ramachandra:
Jens Lehmann wrote:
But I think we recently learned to support that use case with
submodules. I think there are two floating models:
- Tracked:
[...]
- Untracked:
Some people just want the newest tip of a branch checked out in
the
On Tue, Apr 02, 2013 at 10:47:51PM +0300, Mikko Rapeli wrote:
Don't know anything about curl but maybe git could parse the url for a
username and prompt for the password before the first 401 failure roundtrip
that's now in place. I guess most of this logic is in http.c.
We used to do that but
On Tue, Apr 02, 2013 at 01:02:49PM -0600, Felipe Contreras wrote:
Here is the next round of patches for remote-hg, some which have been
contributed through github.
Fortunately it seems to be working for the most part, but there are some
considerable issues while pushing branches and tags.
Seems were getting closer, some comments from a quick read of your
patch below.
Am 26.03.2013 05:03, schrieb Eric Cousineau:
From 2c2923ada809d671828aa58dcda05a1b71222b70 Mon Sep 17 00:00:00 2001
From: Eric Cousineau eacousin...@gmail.com
Date: Mon, 25 Mar 2013 22:27:06 -0500
Subject: [PATCH]
Matthieu Moy matthieu@imag.fr writes:
+static void show_revert_in_progress(struct wt_status *s,
+ struct wt_status_state *state,
+ const char *color)
+{
+ status_printf_ln(s, color, _(You are currently reverting
On Tue, Apr 02, 2013 at 04:05:51PM -0400, Jeff King wrote:
On Tue, Apr 02, 2013 at 10:47:51PM +0300, Mikko Rapeli wrote:
Don't know anything about curl but maybe git could parse the url for a
username and prompt for the password before the first 401 failure roundtrip
that's now in place.
On Tue, Apr 2, 2013 at 1:58 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
We can't use stdout for that in remote helpers.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
You may want to clarify buggy output a bit. Will
On Tue, Apr 2, 2013 at 1:55 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Here is the next round of patches for remote-hg, some which have been
contributed through github.
Thanks.
Fortunately it seems to be working for the most part, but
Junio C Hamano gits...@pobox.com writes:
+if (advice_status_hints) {
+}
+if (advice_status_hints)
+status_printf_ln(s, color,
+_( (use \git revert --abort\ to cancel the revert
operation)));
Why not a single conditional? i.e.
if
Felipe Contreras felipe.contre...@gmail.com writes:
On Tue, Apr 2, 2013 at 1:58 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
We can't use stdout for that in remote helpers.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Felipe Contreras felipe.contre...@gmail.com writes:
On Tue, Apr 2, 2013 at 1:55 PM, Junio C Hamano gits...@pobox.com wrote:
Fortunately it seems to be working for the most part, but there are some
considerable issues while pushing branches and tags.
Do you have a plan in mind what to do
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Il 02/04/2013 16:32, Matthieu Moy ha scritto:
Felipe Contreras felipe.contre...@gmail.com writes:
And this is a workaround:
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -66,7 +66,7 @@
Edward Thomson [ethom...@microsoft.com] wrote:
Junio C Hamano [mailto:gis...@pobox.com] wrote:
* Path A may have only stage #1, while path B and C has only stage
#2 and stage #3 (the user would have to notice these three
correspond to each other, and resolve manually).
You
John Keeping j...@keeping.me.uk writes:
Signed-off-by: John Keeping j...@keeping.me.uk
---
bisect.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bisect.c b/bisect.c
index bd1b7b5..0d33c6f 100644
--- a/bisect.c
+++ b/bisect.c
@@ -526,7 +526,7 @@ struct commit_list
John Keeping j...@keeping.me.uk writes:
When the source file is empty, the calculation of the merge score
results in a division by zero. Since the merge score is initialized to
zero, it makes sense to just leave it as it is if the source size is
zero. This means that we still use the extent
Edward Thomson ethom...@microsoft.com writes:
Edward Thomson [ethom...@microsoft.com] wrote:
Junio C Hamano [mailto:gis...@pobox.com] wrote:
* Path A may have only stage #1, while path B and C has only stage
#2 and stage #3 (the user would have to notice these three
correspond to
Junio C Hamano [mailto:gits...@pobox.com] wrote:
Edward Thomson ethom...@microsoft.com writes:
Junio, did you have additional thoughts on this?
Not at this moment.
I think we have covered the principles (do not unnecessarily duplicate
information, do not break existing implementations
On Tue, Apr 02, 2013 at 02:15:17PM -0700, Junio C Hamano wrote:
John Keeping j...@keeping.me.uk writes:
When the source file is empty, the calculation of the merge score
results in a division by zero. Since the merge score is initialized to
zero, it makes sense to just leave it as it is
Jeff King p...@peff.net writes:
On Tue, Apr 02, 2013 at 01:51:13PM -0400, Jeff King wrote:
Things slowly improve as people make suggestions. I think the thing that
might have helped here is better advice when set-upstream-to is
pointed to a ref that does not exist.
Patches coming in a
Mihai Capotă mi...@mihaic.ro writes:
The code uses division by 1024. Also, the manual uses KiB.
Signed-off-by: Mihai Capotă mi...@mihaic.ro
---
builtin/count-objects.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
On 02.04.2013, at 22:09, John Keeping wrote:
On Tue, Apr 02, 2013 at 01:02:49PM -0600, Felipe Contreras wrote:
Here is the next round of patches for remote-hg, some which have been
contributed through github.
Fortunately it seems to be working for the most part, but there are some
Prepare for the addition of the -g --guides option to git help
and show that help is available for both concept guides, and commands.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
git.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git.c b/git.c
index
This is the re-roll of $gmane/217384. The series seeks to provide a help
option that will list the common git guides, and how to access them.
The series is rebased on top of V1.8.2
Since V2, the OPT_BOOL is now used instead of OPT_COUNTUP.
The git_more_info_string has been further updated
Logic, but no actions, included.
The --all commands option, if given, will display first.
The --guide option's list will then be displayed.
The common commands list is only displayed if neither option,
nor a command or guide name, is given.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
Note that the ability to display an individual guide was
always possible. Include this in the update.
Also tell readers how git(1) can be accessed, especially for
Git for Windows users who do not have the 'man' command.
Likewise include a commentary on how to access this page (Catch 22).
Re-use list_common_cmds_help but simply change the array name.
Candidate for future refactoring to pass a pointer to the array.
The common-guides.h list was generated with a simple variant of the
generate-cmdlist.sh and command-list.txt.
Do not list User-manual and Everday Git which not follow
Rename deprecated OPT_BOOLEAN option to OPT_BOOL in preparation for
'git help --guides'. The former OPT_BOOLEAN would now be OPT_COUNTUP,
but that capability is not required.
Separate out the show_all 'return(0)' and git_more_info_string logic
ready for inclusion of show_guides.
Signed-off-by:
John Keeping j...@keeping.me.uk writes:
The message for commit 6dd4b66 (Fix diffcore-break total breakage)
indicates that don't bother to break small files is wrong in some
cases, but it I wonder if don't bother to break empty files is okay.
This has a rather subtle ramifications, and we
Philip Oakley philipoak...@iee.org writes:
Re-use list_common_cmds_help but simply change the array name.
Candidate for future refactoring to pass a pointer to the array.
The common-guides.h list was generated with a simple variant of the
generate-cmdlist.sh and command-list.txt.
Do not
Philip Oakley philipoak...@iee.org writes:
+To display the linkgit:git[1] man page, use 'git help git'.
Good to see that somebody remembers that we discussed this ;-)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Philip Oakley philipoak...@iee.org writes:
Prepare for the addition of the -g --guides option to git help
and show that help is available for both concept guides, and commands.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
This should come at the end after you taught the -g option,
Philip Oakley philipoak...@iee.org writes:
Rename deprecated OPT_BOOLEAN option to OPT_BOOL in preparation for
'git help --guides'. The former OPT_BOOLEAN would now be OPT_COUNTUP,
but that capability is not required.
Separate out the show_all 'return(0)' and git_more_info_string logic
Felipe Contreras felipe.contre...@gmail.com writes:
Otherwise transport-helper will continue checking for refs and other
things what will confuse the user more.
---
Sign-off?
git-remote-testgit| 11 +++
t/t5801-remote-helpers.sh | 19 +++
Edward Thomson ethom...@microsoft.com writes:
Junio C Hamano [mailto:gits...@pobox.com] wrote:
Edward Thomson ethom...@microsoft.com writes:
Junio, did you have additional thoughts on this?
Not at this moment.
I think we have covered the principles (do not unnecessarily duplicate
Junio C Hamano gits...@pobox.com writes:
If I were solving the issue, I would probably proceed like this:
* Start from a rough sketch of what extra information I would want
to store in the new index extension section.
* Teach read-cache.c to read from the new extension and keep it in
Junio C Hamano gits...@pobox.com writes:
You are creating a gap in the output so that you can add some more
stuff in later patches, which is fine, but I do not think we call
that kind of change a refactor ;-).
The change looks fine.
I'll queue what I suggested on 'pu' for now.
Thanks.
--
On Tue, Apr 2, 2013 at 4:23 PM, Max Horn m...@quendi.de wrote:
On 02.04.2013, at 22:09, John Keeping wrote:
On Tue, Apr 02, 2013 at 01:02:49PM -0600, Felipe Contreras wrote:
Here is the next round of patches for remote-hg, some which have been
contributed through github.
Fortunately it
On Tue, Apr 2, 2013 at 6:39 PM, Philip Oakley philipoak...@iee.org wrote:
OPTIONS
---
-a::
--all::
Prints all the available commands on the standard output. This
- option supersedes any other option.
+ option overides any given command or guide name.
On Tue, Apr 2, 2013 at 6:39 PM, Philip Oakley philipoak...@iee.org wrote:
Re-use list_common_cmds_help but simply change the array name.
Candidate for future refactoring to pass a pointer to the array.
The common-guides.h list was generated with a simple variant of the
generate-cmdlist.sh and
On Sat, Mar 30, 2013 at 5:53 AM, Torsten Bögershausen tbo...@web.de wrote:
sometimes the chown() function is called even when not needed.
(This can be provoced by running t1301, and adding some debug code)
s/provoced/provoked/
Save a chmod from 400 to 400, or from 600-600 on these files:
On Tue, Apr 2, 2013 at 12:53 PM, Torsten Bögershausen tbo...@web.de wrote:
Running make inside contrib/remote-helpers failes in test-lint-duplicates
s/failes/fails/
This was because the regexp to check for duplicate numbers strips everything
after the first - in the filename, including the
* http://www.cheapthomassaboukshop.co.uk/ thomas sabo charms* hired
pondering that your initiate with a venue from your different as well as one
of a kind shimmering purple, options revised inside a good point pertaining
to key high-quality merged with layout make improvements to. Just about
You will see loads of styles of * http://www.pandorajewelryusshop.biz/
pandora charms* available around the sector because time frame with it has
the conceiving. You could find as well pretty much, tons, or 1000s, with
layouts out there that makes customization down with the help of an
On 02.04.13 19:36, Jeff King wrote:
On Tue, Apr 02, 2013 at 06:53:28PM +0200, Torsten Bögershausen wrote:
I think the check for duplicate-numbers is the only one that does not
make sense.
[]
Not sure about that, I send a suggestion of a patch in a minute.
Highlights:
1) - rename the
Running make inside contrib/remote-helpers fails in test-lint-duplicates
This was because the regexp checking for duplicate numbers strips everything
after the first - in the filename, including the prefix.
As a result, 2 pathnames like
/contrib/remote-helpers/test-bzr.sh and
101 - 172 of 172 matches
Mail list logo
