Re: [PATCH 2/2] cygwin: Remove the CYGWIN_V15_WIN32API build variable

2013-04-29 Thread Jonathan Nieder
Hi, Ramsay Jones wrote: Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk Let me try to understand this. Before v1.8.1.1~7^2~2 (Update cygwin.c for new mingw-64 win32 api headers, 2012-11-11), compat/cygwin.c did #define CYGWIN_C #define WIN32_LEAN_AND_MEAN

Re: [PATCH v2] Add support for -i/--interactive to git-clean

2013-04-29 Thread Matthieu Moy
Jiang Xin worldhello@gmail.com writes: Show what would be done and a confirmation dialog before actually cleaning. In the confirmation dialog, the user can input a space separated prefix list, and each clean candidate that matches with one of prefix, will be excluded from cleaning. That

Re: [PATCH] send-email: improve recipients_cmd()

2013-04-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: so if we want to get rid of \Q\E, it would be: open $fh, '-|', qw(sh -c), $cmd . '$@', '-', @args I don't know if that would be better, or converting @args to a list of quoted strings, essentially keeping the current behavior. I

Re: Git.pm with recent File::Temp fail

2013-04-29 Thread Junio C Hamano
Here is what I'll queue. Thanks for the help, all of you. -- 8 -- From: H. Merijn Brand h.m.br...@xs4all.nl Subject: Git.pm: call tempfile from File::Temp as a regular function We call File::Temp's tempfile function as a class method, but it was never designed to be called this way. Older

Re: Git.pm with recent File::Temp fail

2013-04-29 Thread H.Merijn Brand
On Mon, 29 Apr 2013 01:18:18 -0700, Junio C Hamano gits...@pobox.com wrote: Here is what I'll queue. Thanks for the help, all of you. Thank you. I will keep this conversation as a guide for possible next patches -- 8 -- From: H. Merijn Brand h.m.br...@xs4all.nl Subject: Git.pm: call

Re: [PATCHv2 7/7] git grep: honor textconv by default

2013-04-29 Thread Michael J Gruber
Matthieu Moy venit, vidit, dixit 26.04.2013 15:23: Michael J Gruber g...@drmicha.warpmail.net writes: BTW, textconv does not have to be slow - just use textconv-cache. Right, thanks for reminding me about this, I had forgotten its existance ;-). I'm still looking for a way to at least

git-svn: problem with svn cp trunk/subdir tags/subdir_1.0

2013-04-29 Thread Ilya Basin
After fixing --preserve-empty-dirs plus --stdlayout a new problem arised: When creating a tag or branch from a subdir, a disjoint branch is created. Then git-svn re-imports the commits using this dir as strip path. Why? I would instead keep the current commit as parent, delete everything except

[PATCH 0/5] [RESEND] Minor additions to git-completion.bash

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: I do not have the original series, so a resend with Felipe's Acked-by after your original Sign-off would be nice. Felipe Contreras wrote: I only gave them a quick look. This is an unmodified resend of [1] rebased onto the latest `master`. I have not added Felipe's

[PATCH 1/5] git-completion.bash: lexical sorting for diff.statGraphWidth

2013-04-29 Thread Ramkumar Ramachandra
df44483a (diff --stat: add config option to limit graph width, 2012-03-01) added the option diff.startGraphWidth to the list of configuration variables in git-completion.bash, but failed to notice that the list is sorted alphabetically. Move it to its rightful place in the list. Signed-off-by:

[PATCH 2/5] git-completion.bash: add diff.submodule to config list

2013-04-29 Thread Ramkumar Ramachandra
c47ef57 (diff: introduce diff.submodule configuration variable, 2012-11-13) introduced the diff.submodule configuration variable, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- contrib/completion/git-completion.bash | 5

[PATCH 3/5] git-completion.bash: complete branch.*.rebase as boolean

2013-04-29 Thread Ramkumar Ramachandra
6fac1b83 (completion: add missing config variables, 2009-06-29) added rebase to the list of completions for branch.*.*, but forgot to specify completions for the values that this configuration variable can take (namely false and true). Fix this. Signed-off-by: Ramkumar Ramachandra

[PATCH 4/5] git-completion.bash: add branch.*.pushremote to config list

2013-04-29 Thread Ramkumar Ramachandra
9f765ce (remote.c: introduce branch.name.pushremote, 2013-04-02) introduced the configuration variable branch.*.pushremote, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- contrib/completion/git-completion.bash | 4 ++-- 1

[PATCH 5/5] git-completion.bash: add remote.pushdefault to config list

2013-04-29 Thread Ramkumar Ramachandra
224c2171 (remote.c: introduce remote.pushdefault, 2013-04-02) introduced the remote.pushdefault configuration variable, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- contrib/completion/git-completion.bash | 5 + 1 file

Re: [PATCH 0/5] [RESEND] Minor additions to git-completion.bash

2013-04-29 Thread Ramkumar Ramachandra
[Corrected Felipe's email id; sorry, I'm having a bad day] Ramkumar Ramachandra wrote: [...] -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: git-svn: problem with svn cp trunk/subdir tags/subdir_1.0

2013-04-29 Thread Ilya Basin
IB After fixing --preserve-empty-dirs plus --stdlayout a new problem IB arised: IB When creating a tag or branch from a subdir, a disjoint branch IB is created. Then git-svn re-imports the commits using this dir as IB strip path. IB Why? I would instead keep the current commit as parent, delete

Re: Premerging topics

2013-04-29 Thread Antoine Pelisse
On Wed, Apr 24, 2013 at 7:48 AM, Junio C Hamano gits...@pobox.com wrote: there could be textual conflicts and you could choose to leave them in, or you could choose to have rerere resolve it. As long as you do the same when replaying this prepackaged evil merge, this choice does not matter,

git-rnotes: git-notes wrapper for sharing notes between repositories

2013-04-29 Thread Adam Spiers
On Sat, Apr 27, 2013 at 02:21:19PM +0100, Adam Spiers wrote: Hi all, I just wrote a wrapper around git cherry which adds a splash of colour, and facilitates exclusion of commits which should never be upstreamed, by using a git-notes(1) namespace as a blacklist. It's just a quick hack and

Re: Itches with the current rev spec

2013-04-29 Thread Michael J Gruber
Matthieu Moy venit, vidit, dixit 25.04.2013 10:22: Ramkumar Ramachandra artag...@gmail.com writes: Hi, So, I have three serious itches that would be nice to address: 1. git reset --hard HEAD~1/ git show HEAD~1 is a very common idiom that's unnecessarily cumbersome to type out. We can

Re: git grep parallelism question

2013-04-29 Thread Ramkumar Ramachandra
Linus Torvalds wrote: Anyway, I think your patch is good if for no other reason that it allows this kind of testing, but at least for my machine, clearly the current default of eight threads is actually good enough. Maybe somebody with a very different machine might want to run the above

[PATCH] clean: Introduce -z for machine readable output

2013-04-29 Thread Michael J Gruber
-z makes clean output only the names of paths which are or would be deleted, and separates them with \0. Use as xargs -0 -a (git clean -nz [-d]) rm -ri, e.g., as a quick git clean -i. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Here's an alternative approach to that problem

Re: [PATCH] clean: Introduce -z for machine readable output

2013-04-29 Thread Matthieu Moy
Michael J Gruber g...@drmicha.warpmail.net writes: -z makes clean output only the names of paths which are or would be deleted, and separates them with \0. My first reaction was: Is it not a job for git ls-files? Actually, you already almost have it: git clean -d = git ls-files

Re: [PATCHv2 7/7] git grep: honor textconv by default

2013-04-29 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: It should be possible to have a tri-state for the --[no-]textconv option: unset, set to true or set to false. But the code sharing between log, show and diff might make that non-trivial. Right now it's a diffopt bit... I wonder if you can

Re: Itches with the current rev spec

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: - If the UI language for rebase were designed following the composition using common elements like ranges and revisions school, it would have started from rebase --onto=X A..B. I think you're looking at the whole issue backwards from the way I look at it. Let's

Re: Premerging topics

2013-04-29 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: But, as it looks like you would save F on top of M, it means that M would be reachable, and thus rerere would be recomputable from somewhere else. Exactly. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: Itches with the current rev spec

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: - If the UI language for rebase were designed following the composition using common elements like ranges and revisions school, it would have started from rebase --onto=X A..B. I will try to drive the point home one more time. What do you really want to rebase? B

Re: Itches with the current rev spec

2013-04-29 Thread Yann Dirson
On Mon, 29 Apr 2013 20:38:03 +0530 Ramkumar Ramachandra artag...@gmail.com wrote: 3. Range is not an inherent property of A..B or A...B. There are no revision ranges. Well, that could be seen as a problem, the .. syntax being commonly associated with the concept of range. 4. Every command

Re: Itches with the current rev spec

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: - If the UI language for rebase were designed following the composition using common elements like ranges and revisions school, it would have started from rebase --onto=X A..B. I think you're looking at the whole issue backwards from the

Re: [PATCH 6/6] sparse: Fix mingw_main() argument number/type errors

2013-04-29 Thread René Scharfe
Am 28.04.2013 21:31, schrieb Junio C Hamano: René Scharfe rene.scha...@lsrfire.ath.cx writes: Why not take the opposite direction with a patch like this? ... diff --git a/compat/mingw.h b/compat/mingw.h index 389ae01..74e7b87 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -452,11 +452,11

Re: [PATCH v2] Add support for -i/--interactive to git-clean

2013-04-29 Thread Jiang Xin
2013/4/29 Matthieu Moy matthieu@grenoble-inp.fr: Jiang Xin worldhello@gmail.com writes: Show what would be done and a confirmation dialog before actually cleaning. In the confirmation dialog, the user can input a space separated prefix list, and each clean candidate that matches with

Re: git grep parallelism question

2013-04-29 Thread John Keeping
On Mon, Apr 29, 2013 at 07:35:01PM +0530, Ramkumar Ramachandra wrote: On a related note, one place that IO parallelism can provide massive benefits is in executing shell scripts. Accordingly, I always use the following commands to compile and test git respectively: make -j 8 CFLAGS=-g

Re: [BUG] Highly inconsistent diff UI

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Okay, so the point I was trying to make is: The range version of $(git merge-base A B) B is B ^$(git merge-base A B), and not B --not $(git merge-base --all A B) [which is equivalent to B ^A or A..B]. Junio C Hamano wrote: I dunno. The

verify signature hook

2013-04-29 Thread shawn wilson
How do I complain when a commit/merge/tag/etc aren't signed? Ie, everything should be signed and I'd like a hook that complains loudly if something isn't signed (or if a signature isn't verifiable). Also, how do I default to signing everything? -- To unsubscribe from this list: send the line

Re: Re* [PATCH 5/7] git-log.txt: rewrite note on why -- may be required

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: I agree that the confusion paragraph after [--] [path] can be improved, but putting [--] in a paragraph of its own sounds like an overkill. Apart from other things, it means that every single git command would need an identical [--] paragraph

Re: [PATCH 0/5] Documentation/git-diff.txt improvements

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: So, I decided to drop everything and just submit the first two parts. Until we can decide what to do about the 'commit..commit' and 'commit...commit' forms (new rev spec? overload existing rev spec to change the meaning? deprecate without a

improvements to checks for core.notesRef / GIT_NOTES_REF / --ref

2013-04-29 Thread Adam Spiers
On Mon, Apr 29, 2013 at 02:32:05PM +0100, Adam Spiers wrote: I've just written another quick wrapper around 'git notes' which makes it less painless to share notes to and from remote repositories: https://github.com/aspiers/git-config/blob/master/bin/git-rnotes This makes sharing of

Re: verify signature hook

2013-04-29 Thread Junio C Hamano
shawn wilson ag4ve...@gmail.com writes: How do I complain when a commit/merge/tag/etc aren't signed? At which point? A natural place would be to detect this just before accepting a suspicious history being pushed in pre-receive hook, I think. -- To unsubscribe from this list: send the line

Re: [PATCH 0/5] [RESEND] Minor additions to git-completion.bash

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: [Corrected Felipe's email id; sorry, I'm having a bad day] They all look trivial enough, so I'll directly apply to the integration branches. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: improvements to checks for core.notesRef / GIT_NOTES_REF / --ref

2013-04-29 Thread Junio C Hamano
Adam Spiers g...@adamspiers.org writes: static struct notes_tree *init_notes_check(const char *subcommand) ... Can we relax this to refs/, to allow better isolation of namespaces for remote notes? Also, the check is applied for GIT_NOTES_REF and core.notesRef, but not for values

Re: Itches with the current rev spec

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: That world view is broken, isn't it? Perhaps you forgot to consider symmetric differences, where left positives and right positives have to be treated differently. No, I did consider symmetric difference. How is git log A B --not $(git merge-base --all A B) different

Re: [PATCH 0/5] Documentation/git-diff.txt improvements

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: I had an impression that many of them, with the suggested fix-ups, were improvements, with or without the A~B discussion. It seems that the entire review wasted many braincycles if you are to drop the ball at this point, which is very dissapointing. No, I don't meant to

Re: Itches with the current rev spec

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: That world view is broken, isn't it? Perhaps you forgot to consider symmetric differences, where left positives and right positives have to be treated differently. No, I did consider symmetric difference. How is git log

Unexpected behavior of git-subtree

2013-04-29 Thread Steffen Jaeckel
Hi, lately I used git-subtree to integrate a submodule directly into a repository. Now I wanted to push the changes back to the original repository of the submodule and I was a bit surprised by what happened... snip sjaeckel@T7400-003 /h/projects/my_project (develop) $ GIT_TRACE=2 git

Re: Re* [PATCH] git-remote-testgit: avoid process substitution

2013-04-29 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: The patch below doesn't remove the bash dependency, yet, but it addresses the problematic mismatch you noticed without the need for $LF. Can you please queue it to move the topic forward? I'll send three-patch series I have (including the two discussed in

Re: Re* [PATCH 5/7] git-log.txt: rewrite note on why -- may be required

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: That is not a problem. [...] A more important reason to have them as separate entries is to avoid giving a wrong impression that -- is somehow related to path, Okay, makes sense then. Queue it for this and shortlog; we can write it for the other manpages gradually. --

Re: [PATCH 0/5] Documentation/git-diff.txt improvements

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: I had an impression that many of them, with the suggested fix-ups, were improvements, with or without the A~B discussion. It seems that the entire review wasted many braincycles if you are to drop the ball at this point,

[PATCH 0/3] De-bashing remote-testgit

2013-04-29 Thread Junio C Hamano
The two from J6t are what were discussed on the list. The last one is to teach git-remote-testgit to honor SHELL_PATH like all the other shell scripts. Johannes Sixt (2): git-remote-testgit: avoid process substitution git-remote-testgit: further remove some bashisms Junio C Hamano (1):

[PATCH 1/3] git-remote-testgit: avoid process substitution

2013-04-29 Thread Junio C Hamano
From: Johannes Sixt j...@kdbg.org The implementation of bash on Windows does not offer process substitution. Signed-off-by: Johannes Sixt j...@kdbg.org Signed-off-by: Junio C Hamano gits...@pobox.com --- git-remote-testgit | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-)

[PATCH 3/3] git-remote-testgit: build it to run under $SHELL_PATH

2013-04-29 Thread Junio C Hamano
Just like all the other shell scripts, replace the shebang line to make sure it runs under the shell the user specified. As this no longer depends on bashisms, t5801 does not have to say bash must be available somewhere on the system. Signed-off-by: Junio C Hamano gits...@pobox.com ---

[PATCH 2/3] git-remote-testgit: further remove some bashisms

2013-04-29 Thread Junio C Hamano
From: Johannes Sixt j.s...@viscovery.net Signed-off-by: Johannes Sixt j...@kdbg.org --- git-remote-testgit | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/git-remote-testgit b/git-remote-testgit index 643e4ae..b528949 100755 --- a/git-remote-testgit +++

Re: [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges

2013-04-29 Thread Kevin Bracey
On 28/04/2013 21:38, Junio C Hamano wrote: @@ -773,6 +861,9 @@ static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *li * NEEDSWORK: decide if we want to remove parents that are * not marked with TMP_MARK from commit-parents for commits *

Re: consistency problem on ZFS

2013-04-29 Thread Yann Hodique
Junio == Junio C Hamano gits...@pobox.com writes: Yann Hodique yann.hodi...@gmail.com writes: $ git checkout next; git diff-files; git checkout next; git diff-files Already on 'next' :100644 100644 bd774cccaa14e061c3c26996567ee28f4f77ec80 M

Re: [PATCH] pretty: Fix bug in truncation support for %, % and %

2013-04-29 Thread Jonathan Nieder
Hi, Ramsay Jones wrote: Some systems experience failures in t4205-*.sh (tests 18-20, 27) which all relate to the use of truncation with the % padding placeholder. This capability was added in the commit a7f01c6b (pretty: support truncating in %, % and %, 19-04-2013). This is reproducible

Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY

2013-04-29 Thread Thomas Rast
John Keeping j...@keeping.me.uk writes: diff --git a/t/test-lib.sh b/t/test-lib.sh index ca6bdef..70ad085 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -54,8 +54,8 @@ done,*) # do not redirect again ;; *' --tee '*|*' --va'*) - mkdir -p test-results -

Re: consistency problem on ZFS

2013-04-29 Thread Junio C Hamano
Yann Hodique yann.hodi...@gmail.com writes: Junio == Junio C Hamano gits...@pobox.com writes: Yann Hodique yann.hodi...@gmail.com writes: $ git checkout next; git diff-files; git checkout next; git diff-files Already on 'next' :100644 100644 bd774cccaa14e061c3c26996567ee28f4f77ec80

Re: git grep parallelism question

2013-04-29 Thread Thomas Rast
John Keeping j...@keeping.me.uk writes: On Mon, Apr 29, 2013 at 07:35:01PM +0530, Ramkumar Ramachandra wrote: On a related note, one place that IO parallelism can provide massive benefits is in executing shell scripts. Accordingly, I always use the following commands to compile and test git

Re: git grep parallelism question

2013-04-29 Thread John Keeping
On Mon, Apr 29, 2013 at 08:04:10PM +0200, Thomas Rast wrote: John Keeping j...@keeping.me.uk writes: On Mon, Apr 29, 2013 at 07:35:01PM +0530, Ramkumar Ramachandra wrote: On a related note, one place that IO parallelism can provide massive benefits is in executing shell scripts.

Re: [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges

2013-04-29 Thread Junio C Hamano
Kevin Bracey ke...@bracey.fi writes: At present, either query will show lots of really boring merge commits of topic branches at the boundary, with 1 INTERESTING parent that they're TREESAME too, and 1 UNINTERESTING parent that they may or may not be TREESAME to, depending on how old the base

[PATCH 2/2 v2] test output: respect $TEST_OUTPUT_DIRECTORY

2013-04-29 Thread John Keeping
Most test results go in $TEST_OUTPUT_DIRECTORY, but the output files for tests run with --tee or --valgrind just use bare test-results. Changes these so that they do respect $TEST_OUTPUT_DIRECTORY. As a result of this, the valgrind/analyze.sh script may no longer inspect the correct files so it

Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY

2013-04-29 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: John Keeping j...@keeping.me.uk writes: diff --git a/t/test-lib.sh b/t/test-lib.sh index ca6bdef..70ad085 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -54,8 +54,8 @@ done,*) # do not redirect again ;; *' --tee '*|*' --va'*) -

Re: consistency problem on ZFS

2013-04-29 Thread Yann Hodique
Junio == Junio C Hamano gits...@pobox.com writes: Yann Hodique yann.hodi...@gmail.com writes: Junio == Junio C Hamano gits...@pobox.com writes: Yann Hodique yann.hodi...@gmail.com writes: $ git checkout next; git diff-files; git checkout next; git diff-files Already on 'next' :100644

Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY

2013-04-29 Thread John Keeping
On Mon, Apr 29, 2013 at 11:17:00AM -0700, Junio C Hamano wrote: Thomas Rast tr...@inf.ethz.ch writes: John Keeping j...@keeping.me.uk writes: diff --git a/t/test-lib.sh b/t/test-lib.sh index ca6bdef..70ad085 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -54,8 +54,8 @@ done,*)

Re: Unexpected behavior of git-subtree

2013-04-29 Thread John Keeping
On Mon, Apr 29, 2013 at 07:34:27PM +0200, Steffen Jaeckel wrote: lately I used git-subtree to integrate a submodule directly into a repository. Now I wanted to push the changes back to the original repository of the submodule and I was a bit surprised by what happened... snip

Re: [BUG] Highly inconsistent diff UI

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Please don't. All of these clayoven, LICENSE, foom, loom are mere distraction. ... goes and draws the diagram himself ... Sorry, I'm finding it hard to draw this thing. I'm only becoming comfortable with reading it now. $ git log rebase.autostash ^master

Re: [PATCH 2/2] test output: respect $TEST_OUTPUT_DIRECTORY

2013-04-29 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: This is identical to the interdiff of what I posted at the same time, so it obviously looks good to me. Thanks. I've replaced the old tip with your version. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH 0/5] Documentation/git-diff.txt improvements

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: As far as I am concerned, there is no A~B issue. You don't have to remind me about how hostile you are towards new proposals. I already know. Please don't let it take good changes hostage. Those are my changes, and I will not check them in until I'm happy with them.

Re: [BUG] Highly inconsistent diff UI

2013-04-29 Thread John Keeping
On Mon, Apr 29, 2013 at 09:32:51AM -0700, Junio C Hamano wrote: *1* Instead, you have a separate integration branch for testing that merges other's work and your topic. shameless-plug I wrote a script to help manage this [1]. It doesn't do everything I want it to yet but I'm using it on a

Re: [BUG] Highly inconsistent diff UI

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: $ git log rebase.autostash ^$(git merge-base rebase.autostash master) Depending on which one of B or C is chosen it is either one of these: - range ^B H which lists H G D C - range ^C H which lists H G D B neither of which is more useful

Re: [PATCH 0/5] Documentation/git-diff.txt improvements

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: As far as I am concerned, there is no A~B issue. You don't have to remind me about how hostile you are towards new proposals. I already know. That's not hostile or new. I only express strong doubt against ideas (or

Re: [BUG] Highly inconsistent diff UI

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Wait. What does lists H G D A..C even mean? H, G and D I would understand, but how does log ever list A..C??? Now you really confused me. What you said was technically correct. I was pointing out that the graph was misleading because it didn't show any commits between

Re: Itches with the current rev spec

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Compare these (gitk will give you nicer picture): $ git log --oneline --graph --left-right A...B $ git log --oneline --graph --left-right B...A Darn. I didn't realize that rev-list had a --left-right to mark commits with , , or - before giving it to the command.

Re: [BUG] Highly inconsistent diff UI

2013-04-29 Thread Ramkumar Ramachandra
Ramkumar Ramachandra wrote: What are your thoughts on overloading it for rebase? git rebase master~ to rebase onto the merge-base of master and HEAD? I just realized that I meant git rebase master.. and not git rebase master~ I want to rebase the merge commit, not the merge-base

[PATCH] Fix grammar in the 1.8.3 release notes.

2013-04-29 Thread Marc Branchaud
Signed-off-by: Marc Branchaud marcn...@xiplink.com --- This started out as an attempt to make the backward compatibility notes more parsable, but then I just kept going... M. Documentation/RelNotes/1.8.3.txt | 145 +++ 1 file changed, 72

Re: Itches with the current rev spec

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: * Where the bottom of the DAG being replayed is (i.e. X); * What refs are the top of the DAG (i.e. A and B); * Where the new bottom of the replayed DAG (i.e. Y). Okay, so can I start writing a series that will make git rebase accept one negative commit (N) and one

[PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Felipe Contreras
So HEAD@{0}~0^0 is too much to type, but we can remove '^0', and we can remove '~0', and we can remove 'HEAD', but we can't remove '{0}'? This patch allows 'HEAD@' to be the same as 'HEAD@{0}', and similarly with 'master@'. So we can type '@' instead of 'HEAD@', or rather 'HEAD'. So now we can

git -build failure with gettext-0.18.2.1

2013-04-29 Thread Treeve Jelbert
git-1.8.2.2 glibc-2.17 gettext-0.18.2.1 Recent gettext versions install several libraries: /usr/lib/libgettextlib-0.18.2.so /usr/lib/libgettextsrc-0.18.2.so /usr/lib/libintl.so.8.1.2 /usr/include/autosprintf.h /usr/include/gettext-po.h while glibc installs /usr/include/libintl.h git reports:

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Ramkumar Ramachandra
Felipe Contreras wrote: So we can type '@' instead of 'HEAD@', or rather 'HEAD'. So now we can use 'git show @~1', and all that goody goodness. Good one. This is what I didn't think of. The implementation looks beautiful, and I have nothing more to say about the patch. -- To unsubscribe from

Re: [BUG] Highly inconsistent diff UI

2013-04-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: Wait. What does lists H G D A..C even mean? H, G and D I would understand, but how does log ever list A..C??? Now you really confused me. What you said was technically correct. I was pointing out that the graph was

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: So HEAD@{0}~0^0 is too much to type, but we can remove '^0', and we can remove '~0', and we can remove 'HEAD', but we can't remove '{0}'? This patch allows 'HEAD@' to be the same as 'HEAD@{0}', and similarly with 'master@'. So we can type

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: So HEAD@{0}~0^0 is too much to type, but we can remove '^0', and we can remove '~0', and we can remove 'HEAD', but we can't remove '{0}'? Another technical issue, even if you have reflogs. HEAD@{0} and @{0} are referring to two different

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Felipe Contreras
On Mon, Apr 29, 2013 at 3:01 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: So HEAD@{0}~0^0 is too much to type, but we can remove '^0', and we can remove '~0', and we can remove 'HEAD', but we can't remove '{0}'? This patch allows 'HEAD@' to

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Felipe Contreras
On Mon, Apr 29, 2013 at 3:02 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: So HEAD@{0}~0^0 is too much to type, but we can remove '^0', and we can remove '~0', and we can remove 'HEAD', but we can't remove '{0}'? Another technical issue, even

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: But @ is not used just for reflogs, there's @{now}, @{-1}, @{upstream}. True. @{now} is a reflog, @{-1} is also but @{u} is not. It is a kitchen sink and you shouldn't have to have reflog on a branch in order to use @{upstream} (I didn't

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Felipe Contreras
On Mon, Apr 29, 2013 at 3:24 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: But @ is not used just for reflogs, there's @{now}, @{-1}, @{upstream}. True. @{now} is a reflog, @{-1} is also but @{u} is not. It is a kitchen sink and you

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: It shouldn't matter if @{u} is buggy or not (which I doubt), Oh, it wouldn't make any difference to this topic; it is just something we may want to fix if it were broken. -- To unsubscribe from this list: send the line unsubscribe git in the

What's cooking in git.git (Apr 2013, #10; Mon, 29)

2013-04-29 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. There are a few more topics in flight that look sane and trivially correct that I would feel safe to merge down to 'master', but what we have

Re: [BUG] Highly inconsistent diff UI

2013-04-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Have you ever seen me saying it sounds like a good idea to a solution that is looking for a problem? ;-) I'll try to avoid that approach in the future. diff A...B works already, and stopping to refer to diff A..B (the documentation patch you sent out) hopefully will

Re: [PATCH] Fix grammar in the 1.8.3 release notes.

2013-04-29 Thread Junio C Hamano
Marc Branchaud marcn...@xiplink.com writes: This started out as an attempt to make the backward compatibility notes more parsable, but then I just kept going... Thanks. * git bundle did not like a bundle created using a commit without - any message as its one of the prerequistes. +

Re: [PATCH] Fix grammar in the 1.8.3 release notes.

2013-04-29 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Marc Branchaud marcn...@xiplink.com writes: This started out as an attempt to make the backward compatibility notes more parsable, but then I just kept going... Thanks. * git bundle did not like a bundle created using a commit without - any

Re: [PATCH] Fix grammar in the 1.8.3 release notes.

2013-04-29 Thread Junio C Hamano
Marc Branchaud marcn...@xiplink.com writes: Signed-off-by: Marc Branchaud marcn...@xiplink.com --- This started out as an attempt to make the backward compatibility notes more parsable, but then I just kept going... Thanks; everything other than the bundle thing looked sensible. -- To

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Felipe Contreras
On Mon, Apr 29, 2013 at 3:23 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Apr 29, 2013 at 3:02 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: So HEAD@{0}~0^0 is too much to type, but we can remove '^0', and we can remove '~0',

Re: improvements to checks for core.notesRef / GIT_NOTES_REF / --ref

2013-04-29 Thread Adam Spiers
On Mon, Apr 29, 2013 at 10:13:32AM -0700, Junio C Hamano wrote: Adam Spiers g...@adamspiers.org writes: static struct notes_tree *init_notes_check(const char *subcommand) ... Can we relax this to refs/, to allow better isolation of namespaces for remote notes? Also, the check

Re: Premerging topics

2013-04-29 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: Should we think about adding some commands for that ? On the very top of my head (there is certainly more than that): - Save such a change: By basically creating a ref to HEAD (HEAD being the commit, HEAD^ the fixed merge) with

Re: git grep parallelism question

2013-04-29 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Mon, Apr 29, 2013 at 08:04:10PM +0200, Thomas Rast wrote: John Keeping j...@keeping.me.uk writes: On Mon, Apr 29, 2013 at 07:35:01PM +0530, Ramkumar Ramachandra wrote: On a related note, one place that IO parallelism can provide massive

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh index 813cc1b..426c63f 100755 --- a/t/t1503-rev-parse-verify.sh +++ b/t/t1503-rev-parse-verify.sh @@ -115,4 +115,13 @@ test_expect_success 'master@{n} for various n' '

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Felipe Contreras
On Mon, Apr 29, 2013 at 5:38 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh index 813cc1b..426c63f 100755 --- a/t/t1503-rev-parse-verify.sh +++

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Never-mind, now I see the difference, still, I don't think it's relevant for this patch. I don't either. With the precedence of @{u}, @ does not need to have anything to do with a reflog. It is just a random letter that casts a magic spell.

[PATCH] t0008: use named pipe (FIFO) to test check-ignore streaming

2013-04-29 Thread Adam Spiers
sleeps in the check-ignore test suite are not ideal since they can fail when the system is under load, or when a tool like valgrind is used which drastically alters the timing. Therefore we replace them with a more robust solution using a named pipe (FIFO). Thanks to Jeff King for coming up with

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Junio C Hamano
The following message is a courtesy copy of an article that has been posted to gmane.comp.version-control.git as well. Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Apr 29, 2013 at 5:38 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com

Re: [PATCH] Add new @ shortcut for HEAD

2013-04-29 Thread Felipe Contreras
On Mon, Apr 29, 2013 at 6:06 PM, Junio C Hamano gits...@pobox.com wrote: --- a/t/t1503-rev-parse-verify.sh +++ b/t/t1503-rev-parse-verify.sh @@ -115,13 +115,18 @@ test_expect_success 'master@{n} for various n' ' test_must_fail git rev-parse --verify master@{$Np1} '

Re: [PATCH] pretty: Fix bug in truncation support for %, % and %

2013-04-29 Thread Ramsay Jones
Duy Nguyen wrote: On Sun, Apr 28, 2013 at 2:43 AM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: The truncation support was implemented with the assistance of a new strbuf function (strbuf_utf8_replace). This function contains the following code: strbuf_attach(sb_src,

  1   2   >