Re: Poor performance of git describe in big repos

2013-06-03 Thread Alex Bennée
On 31 May 2013 10:57, Alex Bennée kernel-hac...@bennee.com wrote: On 31 May 2013 09:46, Thomas Rast tr...@inf.ethz.ch wrote: So that deleted all unannotated tags pointing at commits, and then it was fast. Curious. However, if that turns out to be the culprit, it's not fixable currently[1].

Re: Poor performance of git describe in big repos

2013-06-03 Thread Alex Bennée
On 31 May 2013 17:17, Jeff King p...@peff.net wrote: On Fri, May 31, 2013 at 12:27:11PM +0200, Thomas Rast wrote: Thomas Rast tr...@inf.ethz.ch writes: However, if that turns out to be the culprit, it's not fixable currently[1]. Having commits with insanely long messages is just, well,

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Thomas Rast
Ramkumar Ramachandra artag...@gmail.com writes: Currently, when performing any operation that saves the state and expects the user the continue (like rebase, bisect, am), the prompt screams: artagnon|completion|REBASE-i 2/2:~/src/git$ Lowercase the words, so we get a more pleasant

Re: [PATCH 3/6] completion: add common options for blame

2013-06-03 Thread Thomas Rast
Ramkumar Ramachandra artag...@gmail.com writes: Add support for completing 'git blame'. List only the common short options. [...] +_git_blame () +{ + __git_has_doubledash return + + case $cur in + -*) + __gitcomp -M -C -L -s -w + esac +

Re: [PATCH 3/6] completion: add common options for blame

2013-06-03 Thread Ramkumar Ramachandra
Thomas Rast wrote: Is this the first time we introduce completion (I guess you could call it help) for short options? I only did a quick search for /-. -/ but it certainly seems that way. Yeah. We generally prefer the long-form equivalents while doing completions, but these blame options do

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Ramkumar Ramachandra
Thomas Rast wrote: Do you have other ways of distinguishing the branch and the state? Colors? I'm a bit too lazy to check. Perhaps it could be made to only use caps if not in colored mode? Currently, no. See git-prompt.sh:401, 403, 409; we don't have a separate color for $r. I didn't

Re: [RFC v2] reflog: show committer date in verbose mode

2013-06-03 Thread Ramkumar Ramachandra
Jiang Xin wrote: It will be nice to add this pretty formatter automatically when run `git reflog` in verbose mode. And in order to support verbose mode, add new flag verbose in struct rev_info. Sorry I missed earlier revisions of this patch. Generally speaking, verbose is a bad way to control

[PATCH] relnotes: fix spelling error in 1.8.4.txt

2013-06-03 Thread Ramkumar Ramachandra
From: 乙酸鋰 ch3co...@gmail.com Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- 乙酸鋰: please read Documentation/SubmittingPatches and submit a patch yourself next time. I've done it for you this time as an example. Junio: please (add-hook 'text-mode-hook 'flyspell-mode) to your

Re: What's cooking in git.git (Jun 2013, #01; Sun, 2)

2013-06-03 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Mon, Jun 3, 2013 at 6:58 AM, Junio C Hamano gits...@pobox.com wrote: [Graduated to master] * tr/line-log (2013-04-22) 13 commits (merged to 'next' on 2013-04-22 at 8f2c1de) Should I resend nd/magic-pathspecs again now that all three topics that

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-03 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: I started looking at this over the weekend but didn't get time to get something ready to be submitted. I did find a couple of issues in cmd_foreach that make me think this topic should be dropped when next is rewound and held in pu waiting for a

Re: [PATCH v2 FIXUP 22/25] fixup! string_list_add_refs_by_glob(): add a comment about memory management

2013-06-03 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- Junio, would you mind squashing this patch onto mh/reflife 22/25? Done. Thanks. notes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/notes.c b/notes.c index 602d956..b69c0b8

Re: [PATCH v2 2/6] send-email: fix suppress-cc=self on cccmd

2013-06-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: When cccmd is used, old-style suppress-from filter is applied by the newer suppress-cc=self isn't. Fix this up. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- git-send-email.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Re: [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges

2013-06-03 Thread René Scharfe
Am 03.06.2013 02:04, schrieb Felipe Contreras: On Sun, Jun 2, 2013 at 6:47 PM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Am 03.06.2013 01:23, schrieb Felipe Contreras: I didn't say we should do 'if (ce) free(ce);' instead of 'free(ce);' I said we should do 'if (cd ce !=

Re: [PATCH v2 2/6] send-email: fix suppress-cc=self on cccmd

2013-06-03 Thread Michael S. Tsirkin
On Mon, Jun 03, 2013 at 08:58:14AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: When cccmd is used, old-style suppress-from filter is applied by the newer suppress-cc=self isn't. Fix this up. Signed-off-by: Michael S. Tsirkin m...@redhat.com ---

Re: [PATCH v2 0/6] git send-email suppress-cc=self fixes

2013-06-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: This includes bugfixes related to handling of --suppress-cc=self flag. Tests are also included. Thanks, will queue. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH v2 1/6] t/send-email.sh: add test for suppress-cc=self

2013-06-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: This adds a basic test for --suppress-cc=self option of git send-email. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 43 +++ 1 file changed, 43 insertions(+) diff --git

Re: Poor performance of git describe in big repos

2013-06-03 Thread Junio C Hamano
Alex Bennée kernel-hac...@bennee.com writes: Why is git attempting to parse a commit not on the DAG for the branch I'm attempting to describe? I think that is because you need to parse the objects at the tip of refs to see if they are on the DAG in the first place. If there weren't any

Re: [PATCH v2 4/6] send-email: make --suppress-cc=self sanitize input

2013-06-03 Thread Michael S. Tsirkin
On Mon, Jun 03, 2013 at 09:17:21AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: --suppress-cc=self fails to filter sender address in many cases where it needs to be sanitized in some way, for example quoted: A U. Thor aut...@example.com To fix, make send-email

Re: [PATCH v2 0/6] git send-email suppress-cc=self fixes

2013-06-03 Thread Michael S. Tsirkin
On Mon, Jun 03, 2013 at 09:18:56AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: This includes bugfixes related to handling of --suppress-cc=self flag. Tests are also included. Thanks, will queue. OK pls let me know if this means you intend to handle the rest

Re: [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges

2013-06-03 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 10:59 AM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Am 03.06.2013 02:04, schrieb Felipe Contreras: On Sun, Jun 2, 2013 at 6:47 PM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Am 03.06.2013 01:23, schrieb Felipe Contreras: I didn't say we should do 'if (ce)

Re: [PATCH v2 4/6] send-email: make --suppress-cc=self sanitize input

2013-06-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: --suppress-cc=self fails to filter sender address in many cases where it needs to be sanitized in some way, for example quoted: A U. Thor aut...@example.com To fix, make send-email sanitize both sender and the address it is compared against.

Re: [PATCH 1/4] read-cache: fix wrong 'the_index' usage

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: We are dealing with the 'istate' index, not 'the_index'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Good catch; will apply. read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH 3/4] unpack-trees: trivial cleanup

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: dfc has not been initialized at this point. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Upon the first entry to this function, because dfc is static struct cache_entry *dfc; it is NULL. In that case, we

Re: [PATCH v2 1/7] add simple tests of consistency across rebase types

2013-06-03 Thread Martin von Zweigbergk
On Tue, May 28, 2013 at 11:39 PM, Martin von Zweigbergk martinv...@gmail.com wrote: create mode 100755 t/t3420-rebase-topology-linear.sh Just FYI, there's another test case with the same number (t3420-rebase-autostash) in pu. I don't know how you normally handle such cases. -- To unsubscribe

Re: preventing evil merges

2013-06-03 Thread Junio C Hamano
Sandro Santilli s...@keybit.net writes: git merge anotherbranch git add something git commit --amend After the steps above the addition of something can't be found in the history anymore, but the file is there. This is a very common and sensible thing to do when dealing with semantic

Re: git daemon --access-hook problem

2013-06-03 Thread Antoine Pelisse
On Fri, May 31, 2013 at 10:22 PM, Eugene Sajine eugu...@gmail.com wrote: and trying to perform some operations like fetch or push. It is cloned and fetches and pushes successfully. The problem is that the file test_hook_out.txt doesn't have anything in it after the execution, So the hook

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: Ramkumar Ramachandra artag...@gmail.com writes: Currently, when performing any operation that saves the state and expects the user the continue (like rebase, bisect, am), the prompt screams: artagnon|completion|REBASE-i 2/2:~/src/git$ Lowercase the

Re: [PATCH 3/6] completion: add common options for blame

2013-06-03 Thread Junio C Hamano
Thomas Rast tr...@inf.ethz.ch writes: Ramkumar Ramachandra artag...@gmail.com writes: Add support for completing 'git blame'. List only the common short options. [...] +_git_blame () +{ +__git_has_doubledash return + +case $cur in +-*) +__gitcomp -M -C -L -s

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

2013-06-03 Thread Peter Oberndorfer
On 2012-11-07 22:13, Jeff King wrote: On Wed, Nov 07, 2012 at 10:10:59PM +0100, Peter Oberndorfer wrote: For me the key to reproduce the problem was to have 2 commits. Adding the file in the root commit it did not work. [1] You probably would need to pass --root for it to do the diff of the

Re: [PATCH 5/6] completion: clarify difftool completion

2013-06-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: 'git difftool' is clearly a frontend to 'git diff' and is used in exactly the same way, but it uses a misleading completion function name __git_complete_file (aliased to to __git_complete_revlist_file). Change it to use

Re: [PATCH 6/6] completion: clarify ls-tree, archive, show completion

2013-06-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Currently, the 'git ls-tree', 'git archive', and 'git show' completions use __git_complete_file (aliased to __git_complete_revlist_file). In the case of 'git ls-tree' and 'git archive', they necessarily require a tree-ish argument (and

Re: preventing evil merges

2013-06-03 Thread Antoine Pelisse
On Mon, Jun 3, 2013 at 7:20 PM, Junio C Hamano gits...@pobox.com wrote: Sandro Santilli s...@keybit.net writes: git merge anotherbranch git add something git commit --amend After the steps above the addition of something can't be found in the history anymore, but the file is there.

Re: [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: I don't see that, and I don't like adding a check that I don't expect to be ever needed. It's called self-documenting code; by adding a check for the NULL pointer, we are stating that ce can be NULL, if we don't do that, people reading

Re: [RFC v2] reflog: show committer date in verbose mode

2013-06-03 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: 2013/6/3 Ramkumar Ramachandra artag...@gmail.com: Jiang Xin wrote: It will be nice to add this pretty formatter automatically when run `git reflog` in verbose mode. And in order to support verbose mode, add new flag verbose in struct rev_info.

Re: Poor performance of git describe in big repos

2013-06-03 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Alex Bennée kernel-hac...@bennee.com writes: Why is git attempting to parse a commit not on the DAG for the branch I'm attempting to describe? I think that is because you need to parse the objects at the tip of refs to see if they are on the DAG in

Re: [PATCH 1/2] diffcore-pickaxe: make error messages more consistent

2013-06-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Currently, diffcore-pickaxe reports two distinct errors for the same user error: $ git log --pickaxe-regex -S'\1' fatal: invalid pickaxe regex: Invalid back reference $ git log -G'\1' # --pickaxe-regex is implied fatal:

Re: [PATCH 2/2] diffcore-pickaxe doc: document -S and -G properly

2013-06-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: The documentation of -S and -G is very sketchy. Completely rewrite the sections in Documentation/diff-options.txt and Documentation/gitdiffcore.txt. Will queue; thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH 6/6] completion: clarify ls-tree, archive, show completion

2013-06-03 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Currently, the 'git ls-tree', 'git archive', and 'git show' completions use __git_complete_file (aliased to __git_complete_revlist_file). In the case of 'git ls-tree' and 'git archive', they necessarily require a tree-ish argument (and

Re: git daemon --access-hook problem

2013-06-03 Thread Eugene Sajine
- Your log file might not be located where you expect, you should use absolute path to dump text You were right! The problem was with the script itself - the log file not being specified with absolute path! Stupid me! ... - The documentation says you can print one line before a failure, also

Re: [PATCH v2 4/6] send-email: make --suppress-cc=self sanitize input

2013-06-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: Yes, I think so too. So - what do you suggest? Add a test? Add a comment? more? Nothing major comes to my mind at this moment. I guess it would be good to add a test or two to use A U. Thor example with and without end-user added

Re: [PATCH v2 2/6] send-email: fix suppress-cc=self on cccmd

2013-06-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: What I tried to do here is split the changes to small chunks and I picked a chunk of a later patch in an earlier one by mistake. So this is fixed up by patch 4/6 in the series, which redefines sender to have the sanitized value, everywhere. I

Re: [PATCH v2 1/7] add simple tests of consistency across rebase types

2013-06-03 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: On Tue, May 28, 2013 at 11:39 PM, Martin von Zweigbergk martinv...@gmail.com wrote: create mode 100755 t/t3420-rebase-topology-linear.sh Just FYI, there's another test case with the same number (t3420-rebase-autostash) in pu. I don't know

Re: [PATCH 3/6] completion: add common options for blame

2013-06-03 Thread SZEDER Gábor
On Mon, Jun 03, 2013 at 03:02:00PM +0530, Ramkumar Ramachandra wrote: Thomas Rast wrote: Is this the first time we introduce completion (I guess you could call it help) for short options? I only did a quick search for /-. -/ but it certainly seems that way. Yeah. We generally prefer

Re: [PATCH v2 1/7] add simple tests of consistency across rebase types

2013-06-03 Thread Martin von Zweigbergk
On Mon, Jun 3, 2013 at 11:05 AM, Junio C Hamano gits...@pobox.com wrote: Martin von Zweigbergk martinv...@gmail.com writes: On Tue, May 28, 2013 at 11:39 PM, Martin von Zweigbergk martinv...@gmail.com wrote: create mode 100755 t/t3420-rebase-topology-linear.sh Just FYI, there's another

Re: What's cooking in git.git (Jun 2013, #01; Sun, 2)

2013-06-03 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: I have updated the patch in the new reply for this thread, and it need some feedbacks: http://thread.gmane.org/gmane.comp.version-control.git/225139/focus=225934 Will re-queue and wait for some feedbacks then. Thanks. -- To unsubscribe from this

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 2 ++ sequencer.c | 6

Re: [PATCH v2 4/8] cherry-pick: store rewritten commits

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: +static void add_rewritten(unsigned char *from, unsigned char *to) +{ + struct rewritten_list_item *item; + if (rewritten.nr + 1 = rewritten.alloc) { + rewritten.alloc += 32; + rewritten.items =

Re: [PATCH v2 5/8] sequencer: run post-rewrite hook

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: As we should. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 45 - 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index

Re: git daemon --access-hook problem

2013-06-03 Thread Antoine Pelisse
On Mon, Jun 3, 2013 at 8:02 PM, Eugene Sajine eugu...@gmail.com wrote: Would you be able to advise how this should be done? I don't get the error message (i mean the output of pwd) if i do this: echo `pwd` exit 1 What should it be? Actually, after digging into the code, it looks like you

Re: [PATCH v9 3/4] contrib: related: add option to parse from committish

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: For example master..feature-a. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related | 38 -- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git

t4015 broken on pu

2013-06-03 Thread Torsten Bögershausen
The new 4015 does not pass under Mac OS: a) The seq command, does not exits (we can use printf) b) One sed expression is not understood, sed exporst needed ;-) git diff diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index b3c4fcc..f00d20b 100755 ---

Re: t4015 broken on pu

2013-06-03 Thread Antoine Pelisse
On Mon, Jun 3, 2013 at 9:01 PM, Torsten Bögershausen tbo...@web.de wrote: The new 4015 does not pass under Mac OS: a) The seq command, does not exits (we can use printf) I was planning to reroll with test_seq instead of seq, as advised by Johannes Sixt. b) One sed expression is not

Re: [PATCH v2 7/8] revert/cherry-pick: add --quiet option

2013-06-03 Thread Junio C Hamano
Makes sense. -- 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: t4015 broken on pu

2013-06-03 Thread Lukas Fleischer
On Mon, Jun 03, 2013 at 09:01:45PM +0200, Torsten Bögershausen wrote: The new 4015 does not pass under Mac OS: a) The seq command, does not exits (we can use printf) [...] diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index b3c4fcc..f00d20b 100755 ---

Re: [PATCH 3/6] completion: add common options for blame

2013-06-03 Thread Junio C Hamano
SZEDER Gábor sze...@ira.uka.de writes: But providing short options for completion is pointless. Those who know git blame's short options will just type them right away, because it requires less key presses than using completion, and those who don't know these options will only see -C, -M,

Re: [PATCH v9 0/4] New git-related helper

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: I changed my mind, this is the same as v9 but minus some potentially controversial changes. Felipe Contreras (4): Add new git-related helper to contrib contrib: related: add support for multiple patches contrib: related: add option

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 2 ++

Re: [PATCH 6/6] completion: clarify ls-tree, archive, show completion

2013-06-03 Thread SZEDER Gábor
On Sun, Jun 02, 2013 at 07:33:42PM +0530, Ramkumar Ramachandra wrote: Currently, the 'git ls-tree', 'git archive', and 'git show' completions use __git_complete_file (aliased to __git_complete_revlist_file). In the case of 'git ls-tree' and 'git archive', they necessarily require a tree-ish

Re: [PATCH v2 2/6] send-email: fix suppress-cc=self on cccmd

2013-06-03 Thread Michael S. Tsirkin
On Mon, Jun 03, 2013 at 11:04:31AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: What I tried to do here is split the changes to small chunks and I picked a chunk of a later patch in an earlier one by mistake. So this is fixed up by patch 4/6 in the series,

Re: git daemon --access-hook problem

2013-06-03 Thread Eugene Sajine
Right, --informative-errors does make it better;) Actually the CWD for the access-hook is not where the hook script is, but inside the .git folder of the target repo. GTK. and yes, definitely some documentation improvements needed;) Thanks! On Mon, Jun 3, 2013 at 3:05 PM, Antoine Pelisse

info/exclude not working

2013-06-03 Thread Devin Rhode
For some reason info/exclude hasn't been working for me. I have a pretty plain macbook pro, with a slow standard hard drive, running the latest mac os 10.7 lion MBP:dish devin$ pwd /Users/devin/Dropbox/ads-G2/dish MBP:dish devin$ cat ../.git/info/exclude # git ls-files --others

Re: [PATCH 1/2] core: use env variable instead of config var to turn on logging pack access

2013-06-03 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/sha1_file.c b/sha1_file.c index 67e815b..7b47bdc 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -36,6 +36,8 @@ static inline uintmax_t sz_fmt(size_t s) { return s; } const unsigned char null_sha1[20]; +static const char

Re: info/exclude not working

2013-06-03 Thread Jeff King
On Mon, Jun 03, 2013 at 01:04:39PM -0700, Devin Rhode wrote: MBP:dish devin$ cat ../.git/info/exclude # git ls-files --others --exclude-from=.git/info/exclude # Lines that start with '#' are comments. # For a project mostly in C, the following would be a good set of # exclude patterns

[PATCH v5 7/7] tests: move test for rebase messages from t3400 to t3406

2013-06-03 Thread Martin von Zweigbergk
t3406 is supposed to test messages from rebase operation, so let's move tests in t3400 that fit that description into 3406. Most of the functionality they tested, except for the messages, has now been subsumed by t3420. --- t/t3400-rebase.sh | 22 --

[PATCH v5 0/7] Rebase topology test

2013-06-03 Thread Martin von Zweigbergk
The only change since v4 should be that t3420 was renamed t3421. Martin von Zweigbergk (7): add simple tests of consistency across rebase types add tests for rebasing with patch-equivalence present add tests for rebasing of empty commits add tests for rebasing root add tests for

[PATCH v5 2/7] add tests for rebasing with patch-equivalence present

2013-06-03 Thread Martin von Zweigbergk
--- t/lib-rebase.sh | 17 t/t3421-rebase-topology-linear.sh | 85 +++ 2 files changed, 102 insertions(+) diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 62b3887..16eeb1c 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@

[PATCH v5 3/7] add tests for rebasing of empty commits

2013-06-03 Thread Martin von Zweigbergk
--- t/t3401-rebase-partial.sh | 24 t/t3421-rebase-topology-linear.sh | 58 +++ 2 files changed, 58 insertions(+), 24 deletions(-) diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 58f4823..7ba1797 100755 ---

[PATCH v5 6/7] t3406: modernize style

2013-06-03 Thread Martin von Zweigbergk
Update the following: - Quote 'setup' - Remove blank lines within test case body - Use test_commit instead of custom quick_one - Create branch topic from tag created by test_commit --- t/t3406-rebase-message.sh | 30 +- 1 file changed, 9 insertions(+), 21

[PATCH v5 4/7] add tests for rebasing root

2013-06-03 Thread Martin von Zweigbergk
--- t/t3421-rebase-topology-linear.sh | 129 ++ 1 file changed, 129 insertions(+) diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh index 81e3d59..659a7b3 100755 --- a/t/t3421-rebase-topology-linear.sh +++

Re: info/exclude not working

2013-06-03 Thread Devin Rhode
I wouldn't worry too much about this use case, we have a pretty lame workflow On Mon, Jun 3, 2013 at 1:32 PM, Jeff King p...@peff.net wrote: On Mon, Jun 03, 2013 at 01:04:39PM -0700, Devin Rhode wrote: MBP:dish devin$ cat ../.git/info/exclude # git ls-files --others

Re: [PATCH 3/4] unpack-trees: trivial cleanup

2013-06-03 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 12:13 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: dfc has not been initialized at this point. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Upon the first entry to this function, because dfc is

[PATCH v5 1/7] add simple tests of consistency across rebase types

2013-06-03 Thread Martin von Zweigbergk
Helped-by: Johannes Sixt j...@kdbg.org --- t/lib-rebase.sh | 15 t/t3421-rebase-topology-linear.sh | 78 +++ 2 files changed, 93 insertions(+) create mode 100755 t/t3421-rebase-topology-linear.sh diff --git a/t/lib-rebase.sh

[PATCH v5 5/7] add tests for rebasing merged history

2013-06-03 Thread Martin von Zweigbergk
--- t/t3400-rebase.sh | 31 + t/t3401-rebase-partial.sh | 45 --- t/t3404-rebase-interactive.sh | 10 +- t/t3409-rebase-preserve-merges.sh | 53 t/t3425-rebase-topology-merges.sh | 258 ++ 5 files changed, 260

Re: [PATCH v2 7/7] unpack-trees: free cache_entry array members for merges

2013-06-03 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 12:40 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: I don't see that, and I don't like adding a check that I don't expect to be ever needed. It's called self-documenting code; by adding a check for the NULL pointer, we

Re: [PATCH v2 4/8] cherry-pick: store rewritten commits

2013-06-03 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 1:49 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: +static void add_rewritten(unsigned char *from, unsigned char *to) +{ + struct rewritten_list_item *item; + if (rewritten.nr + 1 = rewritten.alloc) { +

Re: [PATCH v2 5/8] sequencer: run post-rewrite hook

2013-06-03 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 1:57 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: As we should. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 45 - 1 file changed, 44

Re: [PATCH v9 3/4] contrib: related: add option to parse from committish

2013-06-03 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 2:05 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: For example master..feature-a. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/related/git-related | 38 --

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Jeff King
On Mon, Jun 03, 2013 at 03:17:27PM +0530, Ramkumar Ramachandra wrote: Thomas Rast wrote: Do you have other ways of distinguishing the branch and the state? Colors? I'm a bit too lazy to check. Perhaps it could be made to only use caps if not in colored mode? Currently, no. See

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-03 Thread Jens Lehmann
Am 02.06.2013 20:50, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: Am 30.05.2013 01:58, schrieb Junio C Hamano: * jl/submodule-mv (2013-04-23) 5 commits (merged to 'next' on 2013-04-23 at c04f574) + submodule.c: duplicate real_path's return value (merged to 'next'

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-03 Thread Jens Lehmann
Am 31.05.2013 21:40, schrieb John Keeping: On Thu, May 30, 2013 at 09:23:40PM +0200, Jens Lehmann wrote: Am 30.05.2013 01:58, schrieb Junio C Hamano: * jk/submodule-subdirectory-ok (2013-04-24) 3 commits (merged to 'next' on 2013-04-24 at 6306b29) + submodule: fix quoting in

Setting of push.default or confusion about refspecs

2013-06-03 Thread Kendall Shaw
I am setting up a git repository which I cloned using git svn. git ls-remote shows something like: ... refs/remotes/trunk refs/remotes/2.0.2a ... To get the subversion branch names to appear as a local branch, I: git remote add blah http://example.com/blah git fetch blah

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

2013-06-03 Thread Jeff King
On Mon, Jun 03, 2013 at 07:25:06PM +0200, Peter Oberndorfer wrote: Thanks for the report. I'd still like to pursue using a regex library that does not require NUL-termination, but I've been distracted by other things. I'm going to hold back my copy-to-a-NUL-buffer patch for now and see if

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-03 Thread John Keeping
On Mon, Jun 03, 2013 at 11:47:23PM +0200, Jens Lehmann wrote: Am 31.05.2013 21:40, schrieb John Keeping: The current version does make '$sm_path' relative in submodule foreach, although it's hard to spot because we have to leave doing so until right before the eval. Yes. If I read the

Re: Git status reports untracked on tracked files

2013-06-03 Thread Jeff King
On Wed, May 29, 2013 at 11:40:56AM +0300, Andrey Kiyanovsky wrote: Git version 1.8.1.2. for Windows Git config: [core] repositoryformatversion = 0 filemode = false bare = false logallrefupdates = true symlinks = false ignorecase = true

Re: [PATCH v5 1/7] add simple tests of consistency across rebase types

2013-06-03 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: Helped-by: Johannes Sixt j...@kdbg.org --- t/lib-rebase.sh | 15 t/t3421-rebase-topology-linear.sh | 78 +++ 2 files changed, 93 insertions(+) create mode 100755

[PATCH v2] core: use env variable instead of config var to turn on logging pack access

2013-06-03 Thread Nguyễn Thái Ngọc Duy
5f44324 (core: log offset pack data accesses happened - 2011-07-06) provides a way to observe pack access patterns via a config switch. Setting an environment variable looks more obvious than a config var, especially when you just need to _observe_, and more inline with other tracing knobs we

Re: Is there an API to the .gitignore capability?

2013-06-03 Thread Duy Nguyen
On Sun, Jun 2, 2013 at 9:40 PM, Peng Yu pengyu...@gmail.com wrote: Hi, .gitignore is a flexible way to customize what dir/file to search or not to search. So it is of general use and is more flexible than what is offered by find. I'm wondering if there is an API than I can use besides using

Re: [PATCH] cherry-pick: don't barf when there's nothing to do

2013-06-03 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: If the user set --ff, it's expected that if theres's nothing to do we fast-forward our current HEAD, which is a no-op. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- This is about git cherry-pick topic..master which is a

Re: Setting of push.default or confusion about refspecs

2013-06-03 Thread Kendall Shaw
On 06/03/2013 03:01 PM, Kendall Shaw wrote: ... Regarding the upstream branch, I have in .git/config [remote origin] url = http://example.com/blah fetch = +refs/heads/*:refs/remotes/origin/* [branch master] remote = origin merge = refs/heads/master git config -l shows

Re: [git-users] Highlevel (but simple to implement) commands provided by default for git

2013-06-03 Thread Duy Nguyen
On Thu, May 30, 2013 at 3:07 AM, Junio C Hamano gits...@pobox.com wrote: *1* blame is an oddball (and I suspect the recent log -Ln,m:path may share the same) in that it really wants a concret path, not a pathspec, so you cannot even say cd Documentation; git blame :/Makefile

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Ramkumar Ramachandra
Jeff King wrote: It seems silly to argue about output formats when we are writing a prompt in a convenient Turing-complete scripting language already. What about something like: Could you have a look at __git_ps1_colorize_gitstring from rr/zsh-color-prompt in pu? In the general case, wouldn't

Re: [PATCH 6/6] completion: clarify ls-tree, archive, show completion

2013-06-03 Thread Ramkumar Ramachandra
Junio C Hamano wrote: I think this is the same as 5/6 and better explained in a single patch, as the rationale is the same: these commands can all take the usual revs and then paths, so using misnamed complete_FILE helper is wrong. Mind if I squashed them together? I'm okay with what you've

Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-03 Thread Jeff King
On Tue, Jun 04, 2013 at 09:14:23AM +0530, Ramkumar Ramachandra wrote: Jeff King wrote: It seems silly to argue about output formats when we are writing a prompt in a convenient Turing-complete scripting language already. What about something like: Could you have a look at

Re: [PATCH v5 1/7] add simple tests of consistency across rebase types

2013-06-03 Thread Martin von Zweigbergk
On Mon, Jun 3, 2013 at 3:28 PM, Junio C Hamano gits...@pobox.com wrote: + +# checks that the revisions in $2 represent a linear range with the +# subjects in $1 +test_linear_range () { + ! { git log --format=%p $2 | sane_grep ;} An interesting way to spell: test $(git rev-list

Nike Air Max günstig

2013-06-03 Thread huijao
Der Nike Free Schuhe günstig gemacht wird, welche das Gefühl von barfuß Betrieb selbst dann noch eine Nike Air Max günstig http://www.schuheniketraumwelt.org/nike-air-max Sicherung ist der Fuß zu geben. Wenn Sie barfuß laufen möchte, jedoch sind wirklich müde des Schadens eigenen Füßen zu

Re: Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-03 Thread Heiko Voigt
On Mon, Jun 03, 2013 at 11:23:41PM +0100, John Keeping wrote: Sorry, I should have been more specific here. I saw that you did some changes to make submodule add do the right thing with relative paths, but the following change to t7406 does not work like I believe it should but instead

Nike Air Max 1 sale

2013-06-03 Thread huijao
nike air max 2009 Schuhe oder vielleicht Schuhe sind tatsächlich von den jungen sowie die seltene ziehen in eine Menge Leute, Nike Air Max 1 sale http://www.onlineschuhenikeairmax.org/ die Aufmerksamkeit geliebt. Aber in der Regel ist die seltene Nike Air Reise maximale schwer zu finden oder

Re: [PATCH v5 1/7] add simple tests of consistency across rebase types

2013-06-03 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: Thanks. Will wait another day or two for further comments before I send another version. Thanks; I just noticed that your patches lack S-o-b:. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

  1   2   >