On Sun, Oct 28, 2012 at 04:12:46PM -0400, Patrick Palka wrote:
You can override an option set in the LESS variable by simply prefixing
the command line option with `-+`. This is more robust than the previous
example if the default LESS options are to ever change.
Yeah, the current description
Am 10/25/2012 19:23, schrieb Felipe Contreras:
git diff is perfectly able to do this with '-- files', no need for
manual filtering.
It would have been very useful if you summarized what the code did before
this change.
As for the change itself, it seems to make sense to use git diff's path
Am 10/25/2012 19:23, schrieb Felipe Contreras:
Otherwise the files are missing from the diff, and the list of files.
We do this by creating a limitdiffs variable specific for the view which
can be turned of by using --full-diff.
It would be very helpful if you described the problem. Try it
On Fri, Oct 26, 2012 at 03:33:27PM +0200, Michael J Gruber wrote:
for (p = argv; *p; p++) {
- if (snprintf(ref, sizeof(ref), refs/replace/%s, *p)
+ q = *p;
+ if (get_sha1(q, sha1))
+ warning(Failed to resolve '%s' as a valid ref;
On Mon, Oct 29, 2012 at 6:28 AM, Jeff King p...@peff.net wrote:
On Sun, Oct 28, 2012 at 04:56:47PM -0700, rh wrote:
I'm not using gitweb I was thinking about using it and was looking at the
cgi and saw this in this file:
https://github.com/git/git/blob/master/gitweb/gitweb.perl
I think I
Hi,
Pro Git, By Scott Chacon says:
2.6
Like most VCSs, Git has the ability to tag specific points in
history as being important.
Generally, people use this functionality to mark release points (v1.0,
and so on).
2.6.2:
A [lightweight] tag is very much like a branch that does not change
On Mon, Oct 29, 2012 at 08:12:46AM +0100, Jakub Narębski wrote:
Jakub, can you confirm the intent and a fix like the one above makes
things better?
Yes, either of those makes things better.
Thanks.
(unless highlight does this extension
mapping
On Sun, Oct 28, 2012 at 10:37:16PM +0100, Jens Lehmann wrote:
When renaming orig_args to orig_flags in 98dbe63d (submodule: only
preserve flags across recursive status/update invocations) the call site
of the recursive cmd_status was forgotten. At that place orig_args is
still passed into the
On Fri, Oct 26, 2012 at 10:53:48PM +0700, Nguyen Thai Ngoc Duy wrote:
These two are big code moves, basically all {fetch,send}-pack code.
While I think this is good cleanup (I get surprise every time I look
at transport.c and it leads to buitin/fetch-pack.c), this is probably
not a good idea
On Sun, Oct 21, 2012 at 08:46:37PM +0100, Tom Jones wrote:
git commit -S, --gpg-sign was mentioned in the program's help message,
but not in the manpage.
This adds an equivalent entry for the option in the manpage.
Signed-off-by: Tom Jones t...@oxix.org
Thanks. This slipped through the
Jeff King venit, vidit, dixit 29.10.2012 07:58:
On Fri, Oct 26, 2012 at 03:33:27PM +0200, Michael J Gruber wrote:
for (p = argv; *p; p++) {
-if (snprintf(ref, sizeof(ref), refs/replace/%s, *p)
+q = *p;
+if (get_sha1(q, sha1))
+
On Mon, Oct 29, 2012 at 10:02:47AM +0100, Michael J Gruber wrote:
Jeff King venit, vidit, dixit 29.10.2012 07:58:
On Fri, Oct 26, 2012 at 03:33:27PM +0200, Michael J Gruber wrote:
for (p = argv; *p; p++) {
- if (snprintf(ref, sizeof(ref), refs/replace/%s, *p)
+ q
Peter Oberndorfer kumbay...@arcor.de wrote:
Please review/test the patch carefully before applying,
since i do not often work with tcl/tk :-)
The patch makes perfect sense to me. (I'm not a great tcl coder either
though, and not very familiar with the gitk code; so another review
would be
I agree with you that it is too easy to create chaos by changing tags in
a published repository and that git should do more to prevent this from
happening without explicit user forcing. The fact that git internally
handles tags similarly to other references is IMO an excuse for the
current
Jeff King venit, vidit, dixit 29.10.2012 10:04:
On Mon, Oct 29, 2012 at 10:02:47AM +0100, Michael J Gruber wrote:
Jeff King venit, vidit, dixit 29.10.2012 07:58:
On Fri, Oct 26, 2012 at 03:33:27PM +0200, Michael J Gruber wrote:
for (p = argv; *p; p++) {
- if (snprintf(ref,
On Mon, Oct 29, 2012 at 09:12:52AM +0100, Angelo Borsotti wrote:
Hi,
to let the owner of a remote repository (one on which git-push
deposits objects) disallow
others to change tags, a key on its config file could be used.
An option on git-push, or environment variable, or key in config file
What's cooking in git.git (Oct 2012, #09; Mon, 29)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The second batch of topics has graduated
Jens Lehmann wrote:
Am 02.10.2012 21:44, schrieb Jens Lehmann:
Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
Introduce a diff.submoduleFormat configuration variable corresponding
to the '--submodule' command-line option of 'git diff'.
Nice. Maybe a better name would be diff.submodule,
On Mon, Oct 29, 2012 at 10:58:07AM +0100, Michael Haggerty wrote:
I agree with you that it is too easy to create chaos by changing tags in
a published repository and that git should do more to prevent this from
happening without explicit user forcing. The fact that git internally
handles
On Mon, Oct 29, 2012 at 01:34:01AM -0400, Jeff King wrote:
On Sun, Oct 28, 2012 at 06:34:31PM -0400, W. Trevor King wrote:
On Sun, Oct 28, 2012 at 02:59:33PM -0700, Shawn Pearce wrote:
Looks like the Gerrit meaning is basically the same as Ævar's. Gerrit
updates the parent project as if
On Mon, Oct 29, 2012 at 06:45:44AM -0400, W. Trevor King wrote:
Ah, good, then we *are* all using the option for the same thing.
That makes me more comfortable. Your patch adds support for setting the
variable initially. Does it need any special magic for maintenance, or
is it
On Mon, Oct 29, 2012 at 6:38 AM, Jeff King p...@peff.net wrote:
On Mon, Oct 29, 2012 at 10:58:07AM +0100, Michael Haggerty wrote:
I agree with you that it is too easy to create chaos by changing tags in
a published repository and that git should do more to prevent this from
happening without
Hi Drew,
sure. That is a good starting point. I would suggest to block tag
updates of existing tags if a dedicated option is present in the
config of the remote repo, like, e.g. pushOverwriteTags.
-Angelo
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Mon, Oct 29, 2012 at 07:21:52AM -0400, Drew Northup wrote:
I would have expected git to at least complain about updating an
annotated tag with another annotated tag. But it actually uses the same
fast-forward rule, just on the pointed-to commits. So a fast-forward
annotated re-tag will
On Mon, Oct 29, 2012 at 07:29:45AM -0400, W. Trevor King wrote:
On Mon, Oct 29, 2012 at 06:58:55AM -0400, Jeff King wrote:
Can you send an updated version of the patch that summarizes the
situation in the commit message?
Sure. Should I include Phil's $submodule_var-name export, or would
On Mon, Oct 29, 2012 at 7:35 AM, Jeff King p...@peff.net wrote:
On Mon, Oct 29, 2012 at 07:21:52AM -0400, Drew Northup wrote:
I would have expected git to at least complain about updating an
annotated tag with another annotated tag. But it actually uses the same
fast-forward rule, just on
'git replace' parses the revision arguments when it creates replacements
(so that a sha1 can be abbreviated, e.g.) but not when deleting
replacements.
Make it parse the arguments to 'replace -d' in the same way.
Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net
---
v2 has the simplified
Jeff,
Then on top of that we can talk about what lightweight tags should do.
I'm not sure.
If tags (even the lightweight ones) do not behave differently from
branches, then they are of no use, and the main difference is that
they do not move. So, I would suggest not to move them either.
Herman van Rink r...@initfour.nl writes:
What would a random user have to do to get a patch in? I've found a
number of subtree related mails on the git-user list go completely
unanswerd. Amongst them a patch from James Nylen wich seems very
reasonable.
I have those patches queued for
David Michael Barr b...@rr-dav.id.au writes:
As I have an interest in git-subtree for maintaining the out-of-tree
version of vcs-svn/ and a desire to improve my rebase-fu, I am tempted
to make some sense of the organic growth that happened on GitHub.
It doesn't appear that anyone else is
I also consolidated exts where applicable.
i.e. c and h maps to c
--
diff --git a/a/gitweb.cgi b/b/gitweb.cgi
index 060db27..155b238 100755
--- a/a/gitweb.cgi
+++ b/b/gitweb.cgi
@@ -246,19 +246,19 @@ our %highlight_basename = (
'Makefile' = 'make',
);
# match by extension
+
our
On Mon, 29 Oct 2012 09:52:54 -0700 (PDT)
Kevin Molcard kev2...@gmail.com wrote:
I have a problem with my build system.
I have a remote server with a relatively large repository (around 12
GB, each branch having a size of 3 GB).
I have also 2 build servers (Mac, Windows) that are cloning
On Mon, Oct 29, 2012 at 07:35:00AM -0400, Jeff King wrote:
On Mon, Oct 29, 2012 at 07:21:52AM -0400, Drew Northup wrote:
I would have expected git to at least complain about updating an
annotated tag with another annotated tag. But it actually uses the same
fast-forward rule, just on
On Thu, Oct 25, 2012 at 12:05 PM, Phil Hord ho...@cisco.com wrote:
Jeff King wrote:
On Tue, Oct 23, 2012 at 04:02:54PM -0400, Phil Hord wrote:
Teach git-status to report the sequencer state in short form
using a new --sequencer (-S) switch. Output zero or more
simple state token strings
On Sun, Oct 28, 2012 at 7:21 AM, Jeff King p...@peff.net wrote:
On Mon, Oct 22, 2012 at 09:39:31AM -0400, Scott R. Godin wrote:
As you can see from the below, I can't seem to get it to give me more
verbose results of what's being merged (as in the actual merge below)
with --stat or -v .. is
Hi Andreas,
On Sun, Oct 28, 2012 at 10:34 PM, Andreas Schwab sch...@linux-m68k.org wrote:
Geert Uytterhoeven ge...@linux-m68k.org writes:
Is there a way to force removing unreachable objects in the presence of
broken
links?
Does it help to forcibly expire the reflogs?
You mean git reflog
Jeff King p...@peff.net wrote:
On Fri, Oct 26, 2012 at 09:46:02AM +, Eric Wong wrote:
Overly large values also lead to excessive memory usage. I may have
only had 256M in my dev machine at the time I added this parameter:
That's probably worth mentioning. Gunnlaugur, any objection to
On 2012-10-29 07:05, Jeff King wrote:
On Sun, Oct 28, 2012 at 08:56:39PM +0100, Peter Oberndorfer wrote:
The patch below should fix it. I added tests, but please try your
real-world test case on it to double-check.
I tested your patch, but now it crashes for another reason :-)
Well, that's
Hi,
i recently tested gitk a bit more myself and on some people in the office.
And i noticed when I repeatedly press Shift-F5 gitk
crashes/displays a message box [1].
my current version: c83ae78864493a30ed5b544b4910a384371a5eaf
This also happens a lot when gitk is still loading a big diff
and
On Mon, Oct 29, 2012 at 06:23:30PM +0100, Kacper Kornet wrote:
That patch just blocks non-forced updates to refs/tags/. I think a saner
start would be to disallow updating non-commit objects without a force.
We already do so for blobs and trees because they are not (and cannot
be) fast
On Mon, Oct 29, 2012 at 10:26 PM, Jeff King p...@peff.net wrote:
On Mon, Oct 29, 2012 at 03:56:39PM +0100, Felipe Contreras wrote:
I've ported the tests from hg-git and made sure that the output from
remote-hg
matches the output of hg-git. With these extensive tests I would consider
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 gracefully; I can't even take it in
pu if I can't run the
On Mon, Oct 29, 2012 at 07:33:47PM +0100, Thomas Ackermann wrote:
This patch addresses Junios comment in WC:
Misapplication of a patch fixed; the ones near the tip needs to
update the links to point at the html files, though.
See older mail in this thread:
[...]
That means that for the
On Mon, Oct 29, 2012 at 08:18:47PM +, Eric Wong wrote:
Jeff King p...@peff.net wrote:
On Fri, Oct 26, 2012 at 09:46:02AM +, Eric Wong wrote:
Overly large values also lead to excessive memory usage. I may have
only had 256M in my dev machine at the time I added this parameter:
On Mon, Oct 29, 2012 at 10:56 PM, Jeff King p...@peff.net 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
On Mon, Oct 29, 2012 at 11:02:31PM +0100, Felipe Contreras wrote:
If remote-hg is going to live in contrib, it probably makes sense to
have its tests live there, too, like subtree.
Probably, I'll check that option.
But eventually I think it should be installed by default, unless
On Mon, Oct 29, 2012 at 01:38:28PM -0400, Phil Hord wrote:
I am not sure it is sufficient as-is, though. It does not seem to ever
clear variables, only set them, which means that values could leak
across iterations of the loop, [...] E.g., when
the first submodule has submodule.*.foo set
On Mon, Oct 29, 2012 at 5:36 PM, Jeff King p...@peff.net wrote:
On Mon, Oct 29, 2012 at 01:38:28PM -0400, Phil Hord wrote:
I am not sure it is sufficient as-is, though. It does not seem to ever
clear variables, only set them, which means that values could leak
across iterations of the
On Mon, Oct 29, 2012 at 5:41 PM, Jeff King p...@peff.net wrote:
On Mon, Oct 29, 2012 at 02:05:14PM -0400, Phil Hord wrote:
I'm currently splitting this out into a series and reconsidering some
of it along the way. I need some guidance.
I want to support these two modes:
A. 'git status
On Mon, Oct 29, 2012 at 06:21:08PM -0400, Phil Hord wrote:
Maybe instead of blindly converting config into the environment, it
should forward or clear specific known-meaning config.
Well, that's where we started. I was aiming for the more generic
never needs updating direction.
Then I
On Mon, Oct 29, 2012 at 09:19:48PM +0100, Peter Oberndorfer wrote:
I could reproduce with my 0x3000 bytes file on linux. The buffer is not
read with a trailing null byte it is mapped by mmap in
diff_populate_filespec...
So i think we will not get away with expecting a trailing null :-/
Jeff King p...@peff.net wrote:
Since it was such a small topic, I just went ahead and queued bc22b27 in
my repo. If that's not OK, I can revert it from 'next' and wait to get
it by pulling from you.
That's fine, thanks!
--
To unsubscribe from this list: send the line unsubscribe git in
the
On Mon, Oct 29, 2012 at 06:35:21PM -0400, Jeff King wrote:
The patch below fixes it, but it's terribly inefficient (it just detects
the situation and reallocates). It would be much better to disable the
reuse_worktree_file mmap when we populate the filespec, but it is too
late to pass an
V2 of this patch breaks it into a series, cleans up some gaffes,
and adds more flexible display options. I still need to add some
tests. Until I do that, maybe this should be considered a WIP.
[PATCHv2 1/3] Refactor print_state into get_state
[PATCHv2 2/3] wt-status: More state retrieval
Recently git-status learned to display the state of the git
sequencer in long form to help the user remember an interrupted
command. This information is useful to other callers who do
not want it printed in the same way.
Split the new print_state function into separate get_state and
print_state
wt_status_print_state retrieves some sequencer state
information via wt_status_get_state, but other state
information it deduces on its own. Replaces these
local knowledge deductions with wt_status variables
so we can share more common code in the future.
---
wt-status.c | 16 +---
Teach git-status to report the sequencer state in short form
using a new --sequencer (-S) switch. Output zero or more
simple state token strings indicating the deduced state of the
git sequencer.
Sequencer state info tokens are displayed in short
form. 'git status --short -S' will show the
No reason to use the full path in case this is used externally.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/test-lib.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 514282c..5a3d665 100644
--- a/t/test-lib.sh
+++
On Tue, Oct 30, 2012 at 05:12:57AM +0100, Felipe Contreras wrote:
No reason to use the full path in case this is used externally.
I think it is not just no reason to, but it is actively wrong to use a
full path, as we do not take care to mkdir -p the intervening path
components.
However, this
Hi,
I've ported the tests from hg-git and made sure that the output from remote-hg
matches the output of hg-git. With these extensive tests I would consider this
one ready for wide use. Not only do the tests pass, I've compared the generated
repos of a few projects, and the SHA-1's are exactly
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 359
1 file changed, 359 insertions(+)
create mode 100755 contrib/remote-hg/git-remote-hg
diff --git a/contrib/remote-hg/git-remote-hg
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index 67d39fa..9e29daa 100755
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 215 +++-
1 file changed, 213 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index 9e29daa..337ba40
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index 337ba40..959ab80 100755
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index 959ab80..4d49923 100755
---
Independently of the environment.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 15 +++
1 file changed, 15 insertions(+)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index 29824be..c28f4b4 100755
--- a/contrib/remote-hg/git-remote-hg
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 102 +---
1 file changed, 95 insertions(+), 7 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index c28f4b4..e49f9ed
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 59 -
1 file changed, 53 insertions(+), 6 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index e49f9ed..c2efadf
Or at least no current bookmark.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/git-remote-hg | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index
For hg.hg.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-hg/test-hg-git.sh | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-hg/test-hg-git.sh b/contrib/remote-hg/test-hg-git.sh
index 2b7acb0..a9f5cb2 100755
---
On Tue, Oct 30, 2012 at 5:28 AM, Jeff King p...@peff.net wrote:
On Tue, Oct 30, 2012 at 05:12:57AM +0100, Felipe Contreras wrote:
No reason to use the full path in case this is used externally.
I think it is not just no reason to, but it is actively wrong to use a
full path, as we do not
Hi,
Felipe Contreras wrote:
No reason to use the full path in case this is used externally.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
No reason not to is not a reason to do anything. What symptoms does
this prevent? Could you describe the benefit of this patch in a
On Tue, Oct 30, 2012 at 5:47 AM, Junio C Hamano gits...@pobox.com wrote:
What's the copyright status of the part this borrows from? Is there an
in-file copyright notice needed to *name* the original author?
The set-up part may become easier to read if done with here document.
Pardon
74 matches
Mail list logo
