Re: [PATCH] test-lib: avoid full path to store test results

2012-10-29 Thread Elia Pinto
The shell word splitting done in base is a bashism, iow not portable. Best 2012/10/30, Felipe Contreras : > No reason to use the full path in case this is used externally. > > Signed-off-by: Felipe Contreras > --- > t/test-lib.sh | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > dif

Re: [PATCH v5 12/14] remote-hg: add biridectional tests

2012-10-29 Thread Felipe Contreras
On Tue, Oct 30, 2012 at 5:47 AM, Junio C Hamano 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 terseness, typo and

Re: [PATCH] test-lib: avoid full path to store test results

2012-10-29 Thread Jonathan Nieder
Hi, Felipe Contreras wrote: > No reason to use the full path in case this is used externally. > > Signed-off-by: Felipe Contreras "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 paragraph starting "Now you c

Re: [PATCH] test-lib: avoid full path to store test results

2012-10-29 Thread Felipe Contreras
On Tue, Oct 30, 2012 at 5:28 AM, Jeff King 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 take car

[PATCH v5 14/14] remote-hg: add extra author test

2012-10-29 Thread Felipe Contreras
For hg.hg. Signed-off-by: Felipe Contreras --- 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 --- a/contrib/remote-hg/test-hg-git.sh +++ b/

[PATCH v5 13/14] remote-hg: add tests to compare with hg-git

2012-10-29 Thread Felipe Contreras
The base commands come from the tests of the hg-git project. Signed-off-by: Felipe Contreras --- contrib/remote-hg/test-hg-git.sh | 460 +++ 1 file changed, 460 insertions(+) create mode 100755 contrib/remote-hg/test-hg-git.sh diff --git a/contrib/remote-hg/

[PATCH v5 12/14] remote-hg: add biridectional tests

2012-10-29 Thread Felipe Contreras
Base commands from hg-git tests: https://bitbucket.org/durin42/hg-git/src Signed-off-by: Felipe Contreras --- contrib/remote-hg/Makefile | 13 +++ contrib/remote-hg/test.sh | 241 + 2 files changed, 254 insertions(+) create mode 100644 contrib/remot

[PATCH v5 11/14] remote-hg: add support for fake remote

2012-10-29 Thread Felipe Contreras
Helpful while testing. Signed-off-by: Felipe Contreras --- contrib/remote-hg/git-remote-hg | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg index c41ec95..61c1072 100755 --- a/contrib/remote-hg/git-remote

[PATCH v5 10/14] remote-hg: fake bookmark when there's none

2012-10-29 Thread Felipe Contreras
Or at least no current bookmark. Signed-off-by: Felipe Contreras --- 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 c2efadf..c41ec95 100755 --- a/contrib

[PATCH v5 09/14] remote-hg: add compat for hg-git author fixes

2012-10-29 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 100755 --- a/contrib/remote-h

[PATCH v5 08/14] remote-hg: add support for hg-git compat mode

2012-10-29 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 100755 --- a/contrib/remote-h

[PATCH v5 07/14] remote-hg: match hg merge behavior

2012-10-29 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 +++ b/contrib/remote-hg/gi

[PATCH v5 06/14] remote-hg: make sure the encoding is correct

2012-10-29 Thread Felipe Contreras
Independently of the environment. Signed-off-by: Felipe Contreras --- 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 4d49923..29824be 100755 --- a/contrib/rem

[PATCH v5 05/14] remote-hg: add support to push URLs

2012-10-29 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 --- a/contrib/remote-hg/git-remote-hg +++ b/contr

[PATCH v5 04/14] remote-hg: add support for remote pushing

2012-10-29 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 --- a/contrib/remote-hg/git-remote-hg +++ b/contrib/remo

[PATCH v5 03/14] remote-hg: add support for pushing

2012-10-29 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 100755 --- a/contrib/remote-

[PATCH v5 02/14] remote-hg: add support for bookmarks

2012-10-29 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 --- a/contrib/remote-hg/git-remote-hg +++ b

[PATCH v5 01/14] Add new remote-hg transport helper

2012-10-29 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- 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 b/contrib/remote-hg/git-remote-hg new file mode 1

[PATCH v5 00/14] New remote-hg helper

2012-10-29 Thread Felipe Contreras
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 the

Re: [PATCH] test-lib: avoid full path to store test results

2012-10-29 Thread Jeff King
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, t

[PATCH] test-lib: avoid full path to store test results

2012-10-29 Thread Felipe Contreras
No reason to use the full path in case this is used externally. Signed-off-by: Felipe Contreras --- 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 +++ b/t/test-lib.sh @@ -389,7 +3

[PATCHv2 3/3] git-status: show short sequencer state

2012-10-29 Thread Phil Hord
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 nor

[PATCHv2 2/3] wt-status: More state retrieval abstraction

2012-10-29 Thread Phil Hord
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 +---

[PATCHv2 1/3] Refactor print_state into get_state

2012-10-29 Thread Phil Hord
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 f

[PATCHv2 0/3] git-status short sequencer state info

2012-10-29 Thread Phil Hord
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 abstr

Re: crash on git diff-tree -Ganything for new files with textconv filter

2012-10-29 Thread Jeff King
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 o

Re: [PATCH] Document git-svn fetch --log-window-size parameter

2012-10-29 Thread Eric Wong
Jeff King 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 body of a me

Re: crash on git diff-tree -Ganything for new files with textconv filter

2012-10-29 Thread Jeff King
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 :-/ Th

Re: [PATCH v2] git-submodule add: Add -r/--record option.

2012-10-29 Thread Jeff King
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.

Re: [PATCHv2] git-status: show short sequencer state

2012-10-29 Thread Phil Hord
On Mon, Oct 29, 2012 at 5:41 PM, Jeff King 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

Re: [PATCH v2] git-submodule add: Add -r/--record option.

2012-10-29 Thread Phil Hord
On Mon, Oct 29, 2012 at 5:36 PM, Jeff King 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 loop,

Re: [PATCH v2] git-submodule add: Add -r/--record option.

2012-10-29 Thread Jeff King
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.*.

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-29 Thread Jeff King
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

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-29 Thread Felipe Contreras
On Mon, Oct 29, 2012 at 10:56 PM, 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 import

Re: [PATCH] Document git-svn fetch --log-window-size parameter

2012-10-29 Thread Jeff King
On Mon, Oct 29, 2012 at 08:18:47PM +, Eric Wong wrote: > Jeff King 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: > > >

Re: Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile

2012-10-29 Thread Jeff King
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 f

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-29 Thread Jeff King
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 i

Re: [PATCHv2] git-status: show short sequencer state

2012-10-29 Thread Jeff King
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 --short' with sequence tokens added: >## conflicte

Re: merge --no-commit not able to report stats more verbosely?

2012-10-29 Thread Jeff King
On Mon, Oct 29, 2012 at 02:12:32PM -0400, Phil Hord wrote: > >> (develop)>$ git merge widget_twitter > >> Merge made by the 'recursive' strategy. > >> .../code/community/Dnd/Magentweet/Model/User.php |3 ++- > >> 1 files changed, 2 insertions(+), 1 deletions(-) > > > > Whereas here you do,

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-29 Thread Felipe Contreras
On Mon, Oct 29, 2012 at 10:26 PM, Jeff King 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 >> >

Re: git push tags

2012-10-29 Thread Jeff King
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)

gitk: crash when pressing Shift-F5 while still loading a diff

2012-10-29 Thread Peter Oberndorfer
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 usi

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-29 Thread Jeff King
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 > >> this > >> one ready for wide use. Not only do the tests p

Re: crash on git diff-tree -Ganything for new files with textconv filter

2012-10-29 Thread Peter Oberndorfer
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

Re: [PATCH] Document git-svn fetch --log-window-size parameter

2012-10-29 Thread Eric Wong
Jeff King 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 me > am

Re: Removing unreachable objects in the presence of broken links?

2012-10-29 Thread Geert Uytterhoeven
Hi Andreas, On Sun, Oct 28, 2012 at 10:34 PM, Andreas Schwab wrote: > Geert Uytterhoeven 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 expire --all --expire=0"? Aft

Aw: Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile

2012-10-29 Thread Thomas Ackermann
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: --- Thomas Ackermann writes: > BTW1: As only the changes in the doc files where cherry-picked, curre

Re: merge --no-commit not able to report stats more verbosely?

2012-10-29 Thread Phil Hord
On Sun, Oct 28, 2012 at 7:21 AM, Jeff King 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 it supp

Re: [PATCHv2] git-status: show short sequencer state

2012-10-29 Thread Phil Hord
On Thu, Oct 25, 2012 at 12:05 PM, Phil Hord 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 ind

Re: [PATCH v2] git-submodule add: Add -r/--record option.

2012-10-29 Thread Phil Hord
On Mon, Oct 29, 2012 at 7:43 AM, Jeff King wrote: > 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

Re: git push tags

2012-10-29 Thread Kacper Kornet
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, j

Re: [git-users] Git clone fails with "bad pack header", how to get remote log

2012-10-29 Thread Konstantin Khomoutov
On Mon, 29 Oct 2012 09:52:54 -0700 (PDT) Kevin Molcard 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 the repo > f

[PATCH] gitweb.perl: fix %highlight_ext

2012-10-29 Thread rh
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 %hig

Re: Subtree in Git

2012-10-29 Thread dag
David Michael Barr 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 willing to do this

Re: Subtree in Git

2012-10-29 Thread dag
Herman van Rink 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 merging. I've been

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-29 Thread Felipe Contreras
On Mon, Oct 29, 2012 at 9:50 AM, Jeff King wrote: > On Sun, Oct 28, 2012 at 04:54:00AM +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 >> this >> one

Re: git push tags

2012-10-29 Thread Angelo Borsotti
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. -Ang

[PATCHv2] replace: parse revision argument for -d

2012-10-29 Thread Michael J Gruber
'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 --- v2 has the simplified error check as per Jeff, a

Re: git push tags

2012-10-29 Thread Drew Northup
On Mon, Oct 29, 2012 at 7:35 AM, 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 the p

Re: [PATCH v2] git-submodule add: Add -r/--record option.

2012-10-29 Thread Jeff King
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_ export, or would >

Re: git push tags

2012-10-29 Thread Jeff King
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-t

Re: git push tags

2012-10-29 Thread Angelo Borsotti
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 t

Re: [PATCH v2] git-submodule add: Add -r/--record option.

2012-10-29 Thread W. Trevor King
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_ export, or would you rather have that be a separate series? Phil, were you planning on rollin

Re: git push tags

2012-10-29 Thread Drew Northup
On Mon, Oct 29, 2012 at 6:38 AM, Jeff King 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 explic

Re: [PATCH v2] git-submodule add: Add -r/--record option.

2012-10-29 Thread Jeff King
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

Re: [PATCH v2] git-submodule add: Add -r/--record option.

2012-10-29 Thread W. Trevor King
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 proj

Re: git push tags

2012-10-29 Thread Jeff King
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

Re: [PATCH 4/5] diff: introduce diff.submoduleFormat configuration variable

2012-10-29 Thread Ramkumar Ramachandra
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

What's cooking in git.git (Oct 2012, #09; Mon, 29)

2012-10-29 Thread Jeff King
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

Re: git push tags

2012-10-29 Thread Kacper Kornet
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 f

Re: [PATCH] replace: parse revision argument for -d

2012-10-29 Thread Michael J Gruber
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 (s

Re: git push tags

2012-10-29 Thread Michael Haggerty
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 behavio

Re: [PATCH] gitk: Do not select file list entries during diff loading

2012-10-29 Thread Stefan Haller
Peter Oberndorfer 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 helpful.) Just one

Re: [PATCH] replace: parse revision argument for -d

2012-10-29 Thread Jeff King
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) > >

Re: [PATCH] replace: parse revision argument for -d

2012-10-29 Thread Michael J Gruber
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)) >> +

Re: [PATCH v4 00/13] New remote-hg helper

2012-10-29 Thread Jeff King
On Sun, Oct 28, 2012 at 04:54:00AM +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 this > one ready for wide use. Not only do the tests pass, I've compared th

Re: [PATCH] Add -S, --gpg-sign option to manpage of "git commit"

2012-10-29 Thread Jeff King
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 Thanks. This slipped through the cracks la

Re: [PATCH 0/7] Move code from builtin to libgit.a

2012-10-29 Thread Jeff King
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 id

Re: [PATCH] submodule status: remove unused orig_* variables

2012-10-29 Thread Jeff King
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

Re: gitweb

2012-10-29 Thread Jeff King
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 > > mapp

Re: git push tags

2012-10-29 Thread Angelo Borsotti
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 chang

Re: gitweb

2012-10-29 Thread Jakub Narębski
On Mon, Oct 29, 2012 at 6:28 AM, Jeff King 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 unde

Re: [PATCH] Teach rm to remove submodules when given with a trailing '/'

2012-10-29 Thread Johannes Sixt
Am 10/29/2012 0:28, schrieb Jens Lehmann: > + /* Remove trailing '/' from directories to find submodules in the index > */ > + for (i = 0; i < argc; i++) { > + size_t pathlen = strlen(argv[i]); > + if (pathlen && is_directory(argv[i]) && (argv[i][pathlen - 1] > ==

Re: [PATCH v2] fix 'make test' for HP NonStop

2012-10-29 Thread Jeff King
On Thu, Oct 25, 2012 at 12:57:10PM +0200, Joachim Schmitz wrote: > diff --git a/Makefile b/Makefile > index f69979e..35380dd 100644 > --- a/Makefile > +++ b/Makefile > @@ -1381,6 +1381,15 @@ ifeq ($(uname_S),NONSTOP_KERNEL) > MKDIR_WO_TRAILING_SLASH = YesPlease > # RFE 10-120912-4693 s