Re: bash completion with colour hints

Junio C Hamano venit, vidit, dixit 27.09.2012 08:53: > Simon Oosthoek writes: > >> I read the guide and now I have some questions: >> >> - It suggests to use the oldest commit that contains the "bug" and can >> support the fix. This would be the very first mention of __git_ps1 >> function I think

Re: bash completion with colour hints

On 09/27/2012 10:53 AM, Michael J Gruber wrote: We do not usually add new features to maintenance tracks, so the result of applying the patch does not have to be merge-able to maint or amything older. I would base the patch on v1.7.12 (the latest stable release) if I were you. I now have a pa

Re: bash completion with colour hints

Michael J Gruber writes: > - Bash interpretes '\' only when PS1 is assigned, not when an expansion > in PS1 produces it. What you probably mean is that bash does not rescan expansions for backslash escapes, thus only literal occurences in PS1 are processed (which is consistent with ordinary expa

[PATCH] revision: add --reflog-message to grep reflog messages

Signed-off-by: Nguyễn Thái Ngọc Duy --- On Thu, Sep 27, 2012 at 2:28 AM, Junio C Hamano wrote: > The current commit_match() runs grep_buffer() on commit->buffer. It > probably makes sense to instead notice from opt that we are running > log with "-g", prepare a temporary strbuf and add in t

Re: bash completion with colour hints

On 09/27/2012 10:53 AM, Michael J Gruber wrote: From trying myself, I'm convinced that you need a clever combination of PROMPT_COMMAND and PS1 to make this work. Setting PS1 in PROMPT_COMMAND is probably a no-go because that makes it difficult to customize PS1. I have something in the works wh

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 7:47 AM, Shawn Pearce wrote: > Google has published a series of patches (see links below) to JGit to Should discussions about this series happen in here, jgit mailing or gerrit? I just want to make sure I'll discuss it at the right place. > improve fetch and clone perform

Re: [RFC PATCH] add t3420-rebase-topology

Martin von Zweigbergk writes: > On Tue, Sep 18, 2012 at 12:53 AM, Johannes Sixt wrote: > > > Why? Is it more like "--root implies --force"? > > It doesn't currently exactly imply --force, but the effect is the > same. Also see my reply to Junio's email in this thread. > > Maybe Chris has some

Re: DWIM .git repository discovery

On Wed, Sep 26, 2012 at 7:02 AM, Nguyen Thai Ngoc Duy wrote: > On Wed, Sep 26, 2012 at 11:21 AM, Junio C Hamano wrote: >> Nguyen Thai Ngoc Duy writes: >> >>> I often find myself attempting to examine another repository, >>> especially in projects that are closely related but put in different >>>

Re: DWIM .git repository discovery

On Thu, Sep 27, 2012 at 7:22 PM, Drew Northup wrote: >>> I personally do not think it is _too_ bad to internally do >>> >>> (cd ../path/to/another/repo/path/to && >>> git log --patch file.c) >>> >> >> As long as the .git discovery and path rewriting can be done >> automatically, t

Re: CRLF, LF ... CR ?

Hi Junio and David. Rule is in fact quite simple. If it's a text-file and it contains a LF, a CRLF or a CR, then that's a line-break. :) -So everywhere a LF is checked for, a CR should most likely be checked for. Usually, when checking for CRLF, one is looking for the LF. If a CR precedes the LF

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 5:17 AM, Nguyen Thai Ngoc Duy wrote: > On Thu, Sep 27, 2012 at 7:47 AM, Shawn Pearce wrote: >> Google has published a series of patches (see links below) to JGit to > > Should discussions about this series happen in here, jgit mailing or > gerrit? I just want to make sure

[PATCH] config: introduce GIT_GLOBAL_CONFIG to override ~/.gitconfig

Signed-off-by: Ramkumar Ramachandra --- Documentation/git-config.txt |3 +++ path.c |5 + t/t1306-xdg-files.sh |8 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt in

[PATCH] diff: diff.context configuration gives default to -U

Introduce a configuration variable diff.context that tells Porcelain commands to use a non-default number of context lines instead of 3 (the default). With this variable, users do not have to keep repeating "git log -U8" from the command line; instead, it becomes sufficient to say "git config diff

Re: Commit cache to speed up rev-list and merge

On Thu, Sep 27, 2012 at 5:17 AM, Nguyen Thai Ngoc Duy wrote: > I'd like to see some sort of extension mechanism like in > $GIT_DIR/index, so that we don't have to increase pack index version > often. What I have in mind is optional commit cache to speed up > rev-list and merge, which could be stor

Re: [PATCH v4] Teach rm to remove submodules unless they contain a git directory

Jens Lehmann writes: > Changes since v3: > - Added get_ours_cache_pos() helper to only check stage 2 of a conflict > - Added tests for modified submodules in the conflict case Thanks. > + /* > + * Skip unmerged entries except for populated submodules > +

Option for git bisect run to automatically clean up

Hi everybody, I have just run into a problem when I had to issue an explicit cleanup for tracked files after a configure run in the Qt5 project. I have tried to suggest to the people to bring up this idea on the mailing list in order to get this further on. Unfortunately I did not have time to do

Re: [PATCH] config: introduce GIT_GLOBAL_CONFIG to override ~/.gitconfig

Ramkumar Ramachandra writes: > diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt > index eaea079..c8db03f 100644 > --- a/Documentation/git-config.txt > +++ b/Documentation/git-config.txt > @@ -205,6 +205,9 @@ $GIT_DIR/config:: > User-specific configuration file. Also

Re: [PATCH] revision: add --reflog-message to grep reflog messages

Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- Plase explain yourself in the space above. > diff --git a/Documentation/rev-list-options.txt > b/Documentation/rev-list-options.txt > index 1fc2a18..aeaa58c 100644 > --- a/Documentation/rev-list-options.txt > +++ b/Docum

Re: Configuring the location of ~/.gitconfig

Anurag Priyam writes: >> Not me. For that particular use case, my approach (long before I >> switched the vcs that controls my dotfiles to git) have always been >> to have ~/src that is version controlled, with a Makefile that >> builds/adjusts dotfiles appropriately for each box and installs the

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 07:17:42PM +0700, Nguyen Thai Ngoc Duy wrote: > > Operation Index V2 Index VE003 > > Clone 37530ms (524.06 MiB) 82ms (524.06 MiB) > > Fetch (1 commit back) 75ms 107ms > > Fetch (10 commits ba

Re: [PATCH] config: introduce GIT_GLOBAL_CONFIG to override ~/.gitconfig

Ramkumar Ramachandra writes: > Signed-off-by: Ramkumar Ramachandra > --- > Documentation/git-config.txt |3 +++ > path.c |5 + > t/t1306-xdg-files.sh |8 > 3 files changed, 16 insertions(+), 0 deletions(-) > > diff --git a/Documentation/git

Re: [PATCH] revision: add --reflog-message to grep reflog messages

On Thu, Sep 27, 2012 at 10:09:28AM -0700, Junio C Hamano wrote: > > +--reflog-message=:: > > + Limit the commits output to ones with reflog entries that > > + match the specified pattern (regular expression). Ignored unless > > + --walk-reflogs is given. > > + > > I am debating myself if it

Re: [PATCH] config: introduce GIT_GLOBAL_CONFIG to override ~/.gitconfig

On Thu, Sep 27, 2012 at 08:16:11PM +0530, Ramkumar Ramachandra wrote: > diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt > index eaea079..c8db03f 100644 > --- a/Documentation/git-config.txt > +++ b/Documentation/git-config.txt > @@ -205,6 +205,9 @@ $GIT_DIR/config:: >

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 10:20 AM, Jeff King wrote: > On Thu, Sep 27, 2012 at 07:17:42PM +0700, Nguyen Thai Ngoc Duy wrote: > >> > Operation Index V2 Index VE003 >> > Clone 37530ms (524.06 MiB) 82ms (524.06 MiB) >> > Fetch (1 commit back)

Re: Commit cache to speed up rev-list and merge

On Thu, Sep 27, 2012 at 08:51:51AM -0700, Shawn O. Pearce wrote: > On Thu, Sep 27, 2012 at 5:17 AM, Nguyen Thai Ngoc Duy > wrote: > > I'd like to see some sort of extension mechanism like in > > $GIT_DIR/index, so that we don't have to increase pack index version > > often. What I have in mind i

Re: [PATCH] diff: diff.context configuration gives default to -U

Jeff Muizelaar writes: > Introduce a configuration variable diff.context that tells > Porcelain commands to use a non-default number of context > lines instead of 3 (the default). With this variable, users > do not have to keep repeating "git log -U8" from the command > line; instead, it becomes

Re: Commit cache to speed up rev-list and merge

On Thu, Sep 27, 2012 at 10:39 AM, Jeff King wrote: > On Thu, Sep 27, 2012 at 08:51:51AM -0700, Shawn O. Pearce wrote: >> On Thu, Sep 27, 2012 at 5:17 AM, Nguyen Thai Ngoc Duy >> wrote: >> > I'd like to see some sort of extension mechanism like in >> > $GIT_DIR/index, so that we don't have to inc

Re: [PATCH] config: introduce GIT_GLOBAL_CONFIG to override ~/.gitconfig

Matthieu Moy writes: > Ramkumar Ramachandra writes: > >> diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt >> index eaea079..c8db03f 100644 >> --- a/Documentation/git-config.txt >> +++ b/Documentation/git-config.txt >> @@ -205,6 +205,9 @@ $GIT_DIR/config:: >> User-spe

Re: [PATCH 0/5] wildmatch series update

Thanks; will re-queue. -- 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

[BUG] misplaced space in word diff

Here is a quick test case for a word-diff error, using v1.7.10.4 (debian wheezy package). Setting up: tmp$ mkdir foo && cd foo foo$ git init Initialized empty Git repository in /tmp/foo/.git/ foo (master)$ echo '*.pydiff=python' > .gitattributes foo (master)$ echo 'for name in bar.blurb:' >

Re: [PATCH] revision: add --reflog-message to grep reflog messages

Jeff King writes: > I actually think just checking the reflog when we call "--grep" would > the most common workflow, and requires no extra work from the user. My > only hesitation is that if somebody _does_ want to distinguish, there's > no escape hatch. Of course, the reflog walker is already

Re: DWIM .git repository discovery

Drew Northup writes: >>> I think that this is a road to insanity; anybody who thinks along >>> this line is already on the other side of the line, I would have to >>> say ;-). >> >> We could go slowly and stop before being diagnosed insane. I mean the >> trick can be opted in for a command subset

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 10:35:47AM -0700, Shawn O. Pearce wrote: > > If that is the case, do we need to bump the index > > version at all? Why not store a plain v2 index, and then store an > > additional file "pack-XXX.reachable" that contains the bitmaps and an > > independent version number. >

Re: Commit cache to speed up rev-list and merge

On Thu, Sep 27, 2012 at 10:45:32AM -0700, Shawn O. Pearce wrote: > On 2012-08-12 Nguyen Thai Ngoc Duy wrote: > > Long term we might gain slight lookup speedup if we know object type > > as search region is made smaller. But for that to happen, we need to > > propagate object type hint down to fi

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 11:22 AM, Jeff King wrote: > > I think clients will also want it. If we can make "git rev-list > --objects --all" faster (which this should be able to do), we can speed > up "git prune", which in turn is by far the slowest part of "git gc > --auto", since in the typical cas

Re: [PATCH] diff: diff.context configuration gives default to -U

On Thu, Sep 27, 2012 at 10:40:26AM -0700, Junio C Hamano wrote: > > +test_expect_success 'diff.context affects log' ' > > + git log -1 -p | grep -q -v firstline > > + git config diff.context 8 && > > + git log -1 -p | grep -q firstline > > +' > > Three points: > > - Please avoid "grep -q"

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 11:36:19AM -0700, Shawn O. Pearce wrote: > > Interesting. I would have assumed it depended on order in the index. > > No. We tried that. Assigning bits by order in index (aka order of > SHA-1s sorted) results in horrible compression of the bitmap itself > because of the un

Re: [PATCH] git-web--browse: Fix open HTML help pages from iTerm

Steffen Prohaska writes: > iTerm is an alternative to the default terminal emulation program on Mac > OS X. git-web--browse wasn't aware of iTerm and failed to open HTML > help pages when used in a shell session running in iTerm, reporting "No > known browser available." Now it works as expecte

[PATCH] diff: diff.context configuration gives default to -U

Introduce a configuration variable diff.context that tells Porcelain commands to use a non-default number of context lines instead of 3 (the default). With this variable, users do not have to keep repeating "git log -U8" from the command line; instead, it becomes sufficient to say "git config diff

Re: [PATCH] git-web--browse: Fix open HTML help pages from iTerm

On Sep 27, 2012, at 9:11 PM, Junio C Hamano wrote: > Steffen Prohaska writes: > >> iTerm is an alternative to the default terminal emulation program on Mac >> OS X. git-web--browse wasn't aware of iTerm and failed to open HTML >> help pages when used in a shell session running in iTerm, report

Re: [PATCH 0/8] Fix GIT_CEILING_DIRECTORIES that contain symlinks

Michael Haggerty writes: > This series fixes longest_ancestor_length() so that it works even if > prefix_list contains entries that involve symlinks. The basic goal of > the series is to call real_path() on each of the entries so that a > textual comparison of the potential prefix to the front o

Re: Using bitmaps to accelerate fetch and clone

Hi all, On Fri, Sep 28, 2012 at 3:20 AM, Jeff King wrote: > On Thu, Sep 27, 2012 at 07:17:42PM +0700, Nguyen Thai Ngoc Duy wrote: > >> > Operation Index V2 Index VE003 >> > Clone 37530ms (524.06 MiB) 82ms (524.06 MiB) >> > Fetch (1 commit

Re: [PATCH 3/3] completion: improve shell expansion of items

On Thu, Sep 27, 2012 at 02:43:38AM -0400, Jeff King wrote: > Ah. The problem is that most of the load comes from my patch 4/3, which > does a separate iteration. Here are the numbers after just patch 3: > > $ time __gitcomp_nl "$refs" > real0m0.344s > user0m0.392s > sys 0m0.04

Re: [PATCH] config: introduce GIT_GLOBAL_CONFIG to override ~/.gitconfig

Jeff King writes: > Also, have you considered using a config include? Like: > > $ echo '[include]path = ~/my-dotfiles/gitconfig' >~/.gitconfig Very good suggestion. > ... you have to bootstrap > somehow (e.g., you're going to have to copy a .profile or similar to get > the GIT_GLOBAL_CONFIG v

Showing all stashed changes in one go

When I have a couple of stashed changes, it gets annoying to repeatedly call "git stash show -p stash@{N}" until finding the correct one. Since "git reflog show stash" already does part of the job, I thought that adding "-p" there to see the patch would help (at least it would show the not-yet-sta

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 02:52:29PM -0400, Jeff King wrote: > > No. The pack file name is composed from the SHA-1 of the sorted SHA-1s > > in the pack. Any change in compression settings or delta windows or > > even just random scheduling variations when repacking can cause > > offsets to slide, ev

Re: Showing all stashed changes in one go

On Thu, Sep 27, 2012 at 10:00:06PM +0200, Yann Dirson wrote: > When I have a couple of stashed changes, it gets annoying to > repeatedly call "git stash show -p stash@{N}" until finding the > correct one. > > Since "git reflog show stash" already does part of the job, I thought > that adding "-p"

Re: [PATCH] config: introduce GIT_GLOBAL_CONFIG to override ~/.gitconfig

Jeff King writes: > Also, have you considered using a config include? Like: > > $ echo '[include]path = ~/my-dotfiles/gitconfig' >~/.gitconfig > > It's a one-time setup, and then you get updates inside my-dotfiles > forever. The one-time setup is annoying, but you have to bootstrap > somehow (e

Re: [PATCH 1/8] Introduce new static function real_path_internal()

Michael Haggerty writes: > @@ -54,20 +73,36 @@ const char *real_path(const char *path) > } > > if (*buf) { > - if (!*cwd && !getcwd(cwd, sizeof(cwd))) > - die_errno ("Could not get current working > directory"); > +

Re: Using bitmaps to accelerate fetch and clone

Jeff King writes: > So yeah, we would want to put the pack trailer sha1 into the > supplementary index file, and check that it matches when we open it. > It's a slight annoyance, but it's O(1). Yes. If I am not mistaken, that is exactly how an .idx file makes sure that it describes the matching

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 02:33:01PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > So yeah, we would want to put the pack trailer sha1 into the > > supplementary index file, and check that it matches when we open it. > > It's a slight annoyance, but it's O(1). > > Yes. If I am not mista

Re: [PATCH 4/3] completion: quote completions we find

On Wed, Sep 26, 2012 at 05:57:00PM -0400, Jeff King wrote: > + COMPREPLY[$i]="${COMPREPLY[$i]}$stripped" This reminded me to a mini-series collecting dust in my git repo, which converts a few similar var=$var$something constructs to use the += append operator instead. Now, Bash suppor

Re: [PATCH] diff: diff.context configuration gives default to -U

Jeff Muizelaar writes: > + if (!strcmp(var, "diff.context")) { > + diff_context_default = git_config_int(var, value); > + if (diff_context_default < 0) > + return -1; > + return 0; I am somewhat torn on this part. This fails the entire

Re: [PATCH 4/3] completion: quote completions we find

SZEDER Gábor writes: > On Wed, Sep 26, 2012 at 05:57:00PM -0400, Jeff King wrote: >> +COMPREPLY[$i]="${COMPREPLY[$i]}$stripped" > > This reminded me to a mini-series collecting dust in my git repo, > which converts a few similar var=$var$something constructs to use the > += append ope

Re: [PATCH 3/8] longest_ancestor_length(): use string_list_split()

Michael Haggerty writes: > - for (colon = ceil = prefix_list; *colon; ceil = colon+1) { > - for (colon = ceil; *colon && *colon != PATH_SEP; colon++); > - len = colon - ceil; > + string_list_split(&prefixes, prefix_list, PATH_SEP, -1); > + > + for (i = 0; i < p

Re: [PATCH 4/8] longest_ancestor_length(): explicitly filter list before loop

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: [PATCH 7/8] longest_ancestor_length(): resolve symlinks before comparing paths

Michael Haggerty writes: > longest_ancestor_length() relies on a textual comparison of directory > parts to find the part of path that overlaps with one of the paths in > prefix_list. But this doesn't work if any of the prefixes involves a > symbolic link, because the directories will look diffe

Re: [PATCH 4/3] completion: quote completions we find

On Thu, Sep 27, 2012 at 03:31:10PM -0700, Junio C Hamano wrote: > SZEDER Gábor writes: > > > On Wed, Sep 26, 2012 at 05:57:00PM -0400, Jeff King wrote: > >> + COMPREPLY[$i]="${COMPREPLY[$i]}$stripped" > > > > This reminded me to a mini-series collecting dust in my git repo, > > which con

Fwd: Please pull git-l10n updates on maint branch

Hi, Junio The following changes since commit e70d1632bdaf25a9ee528e78133cab319083eade: Further merging in preparation for 1.7.12.1 (2012-09-12 14:12:48 -0700) are available in the git repository at: git://github.com/git-l10n/git-po maint for you to fetch changes up to 5b3ba7193f2f99fa1c23c

Please pull git-l10n updates on master branch

Hi, Junio The following changes since commit 1084f3b844d80d84d2d318bc562b78514cd78028: The sixth batch for 1.8.0 (2012-09-14 12:34:11 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes up to b2f4b6cec2c5c1e2f802ac4b4bd12d5b264610

Re: Using bitmaps to accelerate fetch and clone

On Thu, Sep 27, 2012 at 9:33 PM, Shawn Pearce wrote: >> I'd like to see some sort of extension mechanism like in >> $GIT_DIR/index, so that we don't have to increase pack index version >> often. > > This might be worthwhile. I dislike the way $GIT_DIR/index encodes > extensions. Forcing an extensi

Re: Using bitmaps to accelerate fetch and clone

On Fri, Sep 28, 2012 at 12:20 AM, Jeff King wrote: >> Definitely :-). I have shown my interest in this topic before. So I >> should probably say that I'm going to work on this on C Git, but >> slllwwwly. As this benefits the server side greatly, perhaps a >> GitHubber ;-) might want to work on

Re: Commit cache to speed up rev-list and merge

On Fri, Sep 28, 2012 at 12:39 AM, Jeff King wrote: > On Thu, Sep 27, 2012 at 08:51:51AM -0700, Shawn O. Pearce wrote: > >> On Thu, Sep 27, 2012 at 5:17 AM, Nguyen Thai Ngoc Duy >> wrote: >> > I'd like to see some sort of extension mechanism like in >> > $GIT_DIR/index, so that we don't have to i

The ciabot hook code in contrib/ is obsolete - delete it

The CIA notification server died about two days ago, done in by a screwup at the cloud service hosting is VM. For various technical reasons there cannot and will not be any effort to revive it. If you want the whole sordid tale, read "CIA and the perils of overengineering" at