Re: Expected behavior of "git check-ignore"...

On Mon, Jul 24, 2017 at 3:23 PM, Junio C Hamano wrote: [snip] > I am reasonably sure that the command started its life as a pure > debugging aid. > > The treatment of the negation _might_ impose conflicting goals to > its purpose as a debugging aid---a user who debugs his .gitignore > file would w

Re: Expected behavior of "git check-ignore"...

On Sun, Jul 23, 2017 at 12:33 PM, Philip Oakley wrote: [snip] >> >> >> git init . >> echo 'foo/*' > .gitignore >> echo '!foo/bar' > .gitignore > > > Is this missing the >> append to get the full two line .gitignore? > adding in a `cat .gitignore` would help check. Yes, sorry about that. > >>

Expected behavior of "git check-ignore"...

A StackOverflow user posted a question about how to reliably check whether a file would be ignored by "git add" and expected "git check-ignore" to return results that matched git add's behavior. It turns out that it doesn't. If there is a negation rule, we end up returning that exclude and printi

Re: [PATCH 0/6] loose-object fsck fixes/tightening

On Fri, Jan 13, 2017 at 12:52 PM, Jeff King wrote: > On Fri, Jan 13, 2017 at 04:15:42AM -0500, John Szakmeister wrote: > >> > I did notice another interesting case when looking at this. Fsck ends up >> > in fsck_loose(), which has the sha1 and path of the loose object. It

Re: "git fsck" not detecting garbage at the end of blob object files...

On Sat, Jan 7, 2017 at 4:47 PM, Dennis Kaarsemaker wrote: > On Sat, 2017-01-07 at 07:50 -0500, John Szakmeister wrote: >> I was perusing StackOverflow this morning and ran across this >> question: >> http://stackoverflow.com/questions/41521143/git-fsck-full-only-checking-

Re: "git fsck" not detecting garbage at the end of blob object files...

On Sun, Jan 8, 2017 at 12:26 AM, Jeff King wrote: > On Sat, Jan 07, 2017 at 10:47:03PM +0100, Dennis Kaarsemaker wrote: >> On Sat, 2017-01-07 at 07:50 -0500, John Szakmeister wrote: >> > I was perusing StackOverflow this morning and ran across this >> > question: &g

"git fsck" not detecting garbage at the end of blob object files...

I was perusing StackOverflow this morning and ran across this question: http://stackoverflow.com/questions/41521143/git-fsck-full-only-checking-directories/ It was a simple question about why "checking objects" was not appearing, but in it was another issue. The user purposefully corrupted a blo

Re: Cleaning ignored files

On Wed, Nov 9, 2016 at 1:23 PM, Roman Terekhov wrote: > Hi, > > I want to ask about git clean -dXf command behaviour. > > I do the following: > > $ mkdir gitignore_test > $ cd gitignore_test/ > $ git init > Initialized empty Git repository in ~/gitignore_test/.git/ > > $ echo *.sln > .gitignore >

Re: Bug with worktrees...

On Thu, Aug 27, 2015 at 10:55 PM, Eric Sunshine wrote: [snip] > I can reproduce with 2.5.0 but not 'master'. Bisection reveals that > this was fixed by d95138e (setup: set env $GIT_WORK_TREE when work > tree is set, like $GIT_DIR, 2015-06-26), and was reported previously > here [1]. I had done a

Bug with worktrees...

My apologies if this has already been reported, but I ran into an interesting bug with worktrees. In particular, I have an alias 'st' that maps to 'status -sb'. When running this under a subdirectory of a worktree created with 'git worktree add', it fails complaining that the work tree has alread

Re: Suggestion: make git checkout safer

On Wed, Jun 3, 2015 at 5:29 PM, Junio C Hamano wrote: [snip] > [Footnote] > > *1* In the context of this discussion, after screwing up the change > in hello.c, instead of expressing the wish to recover and to > start from scratch in two separate commands, i.e. > > rm hello.c && upd

[PATCH] contrib/completion: escape the forward slash in __git_match_ctag

the user hits a key. Escaping the literal / in the parameter expansion (using "/^${1//\//\\/}/") results in: /^chartab/ allowing the completion to work correctly. This formulation also works under bash. Signed-off-by: John Szakmeister --- I've been bit by this bug quite a bit, bu

Re: Build error with current source release

On Tue, Feb 24, 2015 at 9:23 AM, J. R. Westmoreland wrote: > Hi > > I hope it is okay to ask such a question here. > > I cloned the current source tree and tried to build it and I get the > following error. > Could someone tell me why and if there is an easy way to fix it? If you aren't opposed

Re: A better git log --graph?

On Thu, Jan 8, 2015 at 6:39 AM, Yuri D'Elia wrote: [snip] > I usually never use frontends. The notable exception is "tig" when I > want to get a feeling of the status of several branches and/or "blame" > some files. It haves a lot of typing. That being said, I tried gitk, but > assumed it was also

Re: [PATCH v4] Allow TTY tests to run under recent Mac OS

On Fri, Nov 14, 2014 at 6:21 PM, Jonathan Nieder wrote: > Hi, > > Mike Blume wrote: > >> TTY tests were previously skipped on all Mac OS systems because of a >> bug where reading from pty master occasionally hung. This bug has since >> been found not to be reproducible under Mac OS 10.9 and 10.10.

Re: [PATCH v2] allow TTY tests to run under recent Mac OS

On Thu, Nov 13, 2014 at 5:40 PM, Mike Blume wrote: > listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable > TTY on Yosemite and higher I've tried the reproduction recipe on Mavericks (`uname -r` => 13.4.0) and it works fine--still going after 12,000 iterations. Trying the same t

[PATCH v2] diff-highlight: exit when a pipe is broken

means diff-highlight will be launched with SIGPIPE being ignored. Let's work with those broken scripts by restoring the default SIGPIPE handler. Signed-off-by: John Szakmeister --- Incorporates feedback from Jeff King and now we just restore the default signal handler using the corre

Re: [PATCH] diff-highlight: exit when a pipe is broken

On Sat, Nov 1, 2014 at 12:04 AM, Jeff King wrote: > On Fri, Oct 31, 2014 at 07:04:04AM -0400, John Szakmeister wrote: > >> While using diff-highlight with other tools, I have discovered that Python >> ignores SIGPIPE by default. Unfortunately, this also means that tools >>

[PATCH] diff-highlight: exit when a pipe is broken

means diff-highlight will be launched with SIGPIPE being ignored. Let's work with those broken scripts by explicitly setting up a SIGPIPE handler and exiting the process. Signed-off-by: John Szakmeister --- contrib/diff-highlight/diff-highlight | 9 + 1 file changed, 9 insertion

Re: [PATCH] [kernel] completion: silence "fatal: Not a git repository" error

On Tue, Oct 14, 2014 at 2:29 PM, Junio C Hamano wrote: > John Szakmeister writes: > >> It is possible that a user is trying to run a git command and fail to realize >> that they are not in a git repository or working tree. When trying to >> complete >> an operati

Re: [PATCH] [kernel] completion: silence "fatal: Not a git repository" error

On Tue, Oct 14, 2014 at 6:49 AM, John Szakmeister wrote: > It is possible that a user is trying to run a git command and fail to realize > that they are not in a git repository or working tree. When trying to > complete > an operation, __git_refs would fall to a degenerate case an

[PATCH] [kernel] completion: silence "fatal: Not a git repository" error

#x27;s fix this by shunting the error message coming from "git for-each-ref". Signed-off-by: John Szakmeister --- contrib/completion/git-completion.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/

Re: A failing attempt to use Git in a centralized environment

On Wed, Apr 30, 2014 at 1:15 PM, Geert Bosch wrote: > > On Apr 28, 2014, at 02:29, Marat Radchenko wrote: > >> In short: >> 1. Hack, hack, hack >> 2. Commit >> 3. Push, woops, reject (non-ff) >> 4. Pull >> 5. Push > > Just do pull --rebase? This is essentially the same as what SVN > used to do in

Re: Pull is Mostly Evil

On Fri, May 2, 2014 at 2:13 PM, Junio C Hamano wrote: [snip] > Your earlier long-hand, together with the two examples that pulls > into the same "maint" branch Brian gave us, may give us a better > starting points to think about a saner way. > > To me, the problem sounds like: > > Tutorials of

Re: git-draw - draws nearly the full content of a tiny git repository as a graph

On Wed, Jan 29, 2014 at 4:21 PM, Flo wrote: > I just want to present a small tool I wrote. I use it at work to have > a tool visualizing the Git basic concepts and data structures which > "are really really really simple" (Linus' words). That helps me > teaching my colleagues about Git and answeri

Re: [PATCH 2/2] format-patch: introduce format.defaultTo

On Mon, Jan 6, 2014 at 5:54 PM, Ramkumar Ramachandra wrote: > John Szakmeister wrote: >> Then where does it get pushed? Do you always specify where to save your >> work? >> >> FWIW, I think the idea of treating @{u} as the eventual recipient of >> your change

Re: [PATCH 2/2] format-patch: introduce format.defaultTo

On Mon, Jan 6, 2014 at 3:42 PM, Jonathan Nieder wrote: > John Szakmeister wrote: > >>I think in a >> typical, feature branch-based workflow @{u} would be nearly useless. > > I thought the idea of @{u} was that it

Re: [PATCH 2/2] format-patch: introduce format.defaultTo

On Mon, Jan 6, 2014 at 3:18 PM, Jeff King wrote: > On Mon, Jan 06, 2014 at 12:06:51PM -0800, Junio C Hamano wrote: > >> Unless you set @{u} to this new configuration, in which case the >> choice becomes dynamic depending on the current branch, but >> >> - if that is the only sane choice based on

[PATCH v3] contrib/git-credential-gnome-keyring.c: small stylistic cleanups

Signed-off-by: John Szakmeister Signed-off-by: Junio C Hamano Reviewed-by: Felipe Contreras --- Thanks for the extra patch Junio. I incorporated it and fixed a few other minor violations I found afterwards. This version builds on the first version of the patch--without dropping the gpointer

Re: [PATCH] contrib/git-credential-gnome-keyring.c: small stylistic cleanups

On Mon, Dec 9, 2013 at 1:06 PM, Junio C Hamano wrote: [snip] > > I thought we cast without SP after the (typename), i.e. > > gpointer *data = (gpointer *)user_data; I've found a mixture of both in the code base, and the CodingGuidelines doesn't say either way. I'm happy to switch the fil

[PATCH v2] contrib/git-credential-gnome-keyring.c: small stylistic cleanups

Signed-off-by: John Szakmeister Reviewed-by: Felipe Contreras --- v2 removes some unnecessary casting noticed by Felipe. Thanks for the feedback Felipe! .../gnome-keyring/git-credential-gnome-keyring.c | 55 ++ 1 file changed, 25 insertions(+), 30 deletions(-) diff

[PATCH] contrib/git-credential-gnome-keyring.c: small stylistic cleanups

Signed-off-by: John Szakmeister --- The gnome-keyring credential backend had a number of coding style violations. I believe this fixes all of them. .../gnome-keyring/git-credential-gnome-keyring.c | 55 ++ 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a

Re: Can't connect to git-scm.com

On Thu, Nov 28, 2013 at 8:47 AM, Antoine Pelisse wrote: > Hello, > > Should we be worried by this behavior ? > > git-scm.com is returning 301 to www.git-scm.com (I don't remember that > it was happening before) > And www.git-scm.com is returning 200: Sorry, no Host found. I'm not sure what happen

Re: [PATCH v2 00/14] Officially start moving to the term 'staging area'

On Fri, Oct 18, 2013 at 5:46 AM, Matthieu Moy wrote: > I'm lacking time to read and answer in detail, sorry. > > Junio C Hamano writes: > >> "It must be done" is different from "any change is good, as long as >> it introduces more instances of word 'stage'". > > I agree. Something must be done, a

Re: [PATCH v3] Add core.mode configuration

On Wed, Oct 16, 2013 at 6:54 AM, John Szakmeister wrote: [snip] > "probably a minority" -- I guess that's the part I disagree with. I'm > not sure what a minority means here, but I don't think it'll be a > handful of people. How big does that number get b

Re: [PATCH v3] Add core.mode configuration

On Tue, Oct 15, 2013 at 11:55 PM, Felipe Contreras wrote: [snip] > We cannot change the behavior of push.default = simple already, so at least > that option is not in question. True. > Presumably you are worried about the other options that can't be enabled in > any > way. Yes. > But think ab

Re: [PATCH v3] Add core.mode configuration

On Tue, Oct 15, 2013 at 10:51 AM, Krzysztof Mazur wrote: > On Tue, Oct 15, 2013 at 08:29:56AM -0500, Felipe Contreras wrote: >> Krzysztof Mazur wrote: >> > On Tue, Oct 15, 2013 at 07:32:39AM -0500, Felipe Contreras wrote: >> > > Krzysztof Mazur wrote: >> > > > >> > > > But with core.mode = next af

Re: [PATCH v3] build: add default aliases

On Tue, Sep 24, 2013 at 10:35 AM, Felipe Contreras wrote: > On Tue, Sep 24, 2013 at 6:06 AM, John Szakmeister > wrote: [snip] >> There's nothing objective about "Nobody every (sic) agrees changes are >> good". If it were true, no changes would get in. > >

Re: [PATCH v3] build: add default aliases

On Tue, Sep 24, 2013 at 2:39 PM, Jonathan Nieder wrote: > Jeff King wrote: >> On Sat, Sep 21, 2013 at 02:20:21PM -0500, Felipe Contreras wrote: > >>> For now simply add a few common aliases. >>> >>> co = checkout >>> ci = commit >>> rb = rebase >>> st = status >> >> Are these the best defi

Re: [PATCH v3] build: add default aliases

On Tue, Sep 24, 2013 at 6:25 AM, Felipe Contreras wrote: > On Tue, Sep 24, 2013 at 4:19 AM, John Szakmeister > wrote: >> On Sat, Sep 21, 2013 at 3:20 PM, Felipe Contreras >> wrote: >>> For now simply add a few common aliases. >>> >>> co = checkout

Re: [PATCH v3] build: add default aliases

On Sat, Sep 21, 2013 at 3:20 PM, Felipe Contreras wrote: > For now simply add a few common aliases. > > co = checkout > ci = commit > rb = rebase > st = status > > Signed-off-by: Felipe Contreras > --- > > I still think we should ship a default /etc/gitconfig, but the project needs > to

Re: [PATCH 00/15] Make Gnome Credential helper more Gnome-y and support ancient distros

commit untested code. Otherwise, there are a few stylistic nits that I'd like to clean up. Only one was introduced by you--Felipe pointed it out--and I have a patch for the rest that I can submit after your series has been applied. Acked-by: John Szakmeister -John -- To unsubscribe from this list

Re: Local tag killer

On Sat, Sep 21, 2013 at 2:42 AM, Michael Haggerty wrote: > On 09/21/2013 12:51 AM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> I also agree that the documentation is misstated; "remote-tracking branch" >>> may have been a convenient and well understood phrase for whoever wrote >>> that

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

On Wed, Sep 11, 2013 at 3:24 AM, Matthieu Moy wrote: > Junio C Hamano writes: > >> But at the same time, I feel that these redundant lines, especially >> the latter one, would give the users a stronger cue than just saying >> that "bar is Untracked"; "do X to include" reminds that bar will not >>

Re: Zero padded file modes...

On Thu, Sep 5, 2013 at 11:36 AM, Jeff King wrote: > On Thu, Sep 05, 2013 at 10:00:39AM -0400, John Szakmeister wrote: > >> I went to clone a repository from GitHub today and discovered >> something interesting: >> >> :: git clone https://github.com/liebke/in

Zero padded file modes...

I went to clone a repository from GitHub today and discovered something interesting: :: git clone https://github.com/liebke/incanter.git Cloning into 'incanter'... remote: Counting objects: 10457, done. remote: Compressing objects: 100% (3018/3018), done. error: object 4946e1ba

Re: [PATCH 0/3] Reject non-ff pulls by default

On Thu, Sep 5, 2013 at 7:38 AM, John Keeping wrote: > On Thu, Sep 05, 2013 at 07:01:03AM -0400, John Szakmeister wrote: [snip] >> So what I really want isn't quite rebase. I'm not sure any of the >> proposed solutions would work. It'd be really nice to repla

Re: [PATCH 0/3] Reject non-ff pulls by default

On Wed, Sep 4, 2013 at 6:59 PM, Junio C Hamano wrote: [snip] > When "git pull" stops because what was fetched in FETCH_HEAD does > not fast-forward, then what did _you_ do (and with the knowledge you > currently have, what would you do)? In a single project, would you > choose to sometimes rebase

Re: Git in nutshell Inbox

On Tue, Jul 9, 2013 at 10:39 AM, Matthieu Moy wrote: > Muhammad Bashir Al-Noimi writes: > >> I'm bzr user and I want to migrate to git. Generally I use bzr through >> Bazaar Explorer which is very easy & neat GUI utility for managing bzr >> repositories. May you please guide me to most easy way t

Re: [PATCH] prompt: do not double-discriminate detached HEAD

On Sun, Jul 7, 2013 at 8:52 AM, Ramkumar Ramachandra wrote: > When GIT_PS1_SHOWCOLORHINTS is turned on, there is no need to put a > detached HEAD within parenthesis: the color can be used to discriminate > the detached HEAD. > > Signed-off-by: Ramkumar Ramachandra > --- > For cuteness :) Person

Re: Bug on OS X...

On Fri, Jun 28, 2013 at 1:13 PM, Junio C Hamano wrote: > John Szakmeister writes: > >> On Fri, Jun 28, 2013 at 8:44 AM, Max Horn wrote: >> [snip] > >>> I am unable to reproduce this on Mac OS X 10.7.5 with git 1.8.3.1 >>> nor with current git maint. Com

Re: Bug on OS X...

On Fri, Jun 28, 2013 at 8:44 AM, Max Horn wrote: [snip] > I am unable to reproduce this on Mac OS X 10.7.5 with git 1.8.3.1 nor with > current git maint. Command run inside /tmp, which is on a normal HFS+ volume > (using the default settings, i.e. the FS is case insensitive). > > > $ git --versi

Re: [PATCH] Do not call built-in aliases from scripts

On Thu, Jun 27, 2013 at 1:27 PM, Junio C Hamano wrote: [snip] >> diff --git a/git-am.sh b/git-am.sh >> index 9f44509..ad67194 100755 >> --- a/git-am.sh >> +++ b/git-am.sh >> @@ -16,8 +16,8 @@ s,signoff add a Signed-off-by line to the commit >> message >> u,utf8 recode into utf8 (d

Bug on OS X...

I wanted to look at some OpenWRT bits this morning and ran into an issue cloning the packages repository when setting up the package feed. The feeds script executes this under the hood: git clone --depth 1 git://nbd.name/packages.git feeds/packages When trying to run the command directly on O

Re: [BUG] clone: regression in error messages in master

On Fri, Jun 21, 2013 at 1:11 PM, Junio C Hamano wrote: > John Szakmeister writes: [snip] >> I can see where this is confusing, but can also see how it's useful >> information to have. On clone, it's probably not that useful since >> you're looking ri

Re: [BUG] clone: regression in error messages in master

On Thu, Jun 20, 2013 at 9:16 AM, Ramkumar Ramachandra wrote: > Hi, > > So this should explain the problem: > > # using v1.8.3.1 > $ git clone https://google.com > Cloning into 'google.com'... > fatal: repository 'https://google.com/' not found > > # using master > $ git clone https://g

Re: [PATCH] Documentation/CommunityGuidelines

On Tue, Jun 11, 2013 at 3:46 PM, Philip Oakley wrote: > From: "Michael Haggerty" > Sent: Tuesday, June 11, 2013 7:52 PM > [...] > >> >> That's a very good point (and a good illustration, too). How do you >> like the new second and third sentences below? >> >> * When reviewing other peoples' code

Re: [PATCH] credential-osxkeychain: support more protocols

e when you make the commit by using the `-s` option on `git commit`. You can also add an "Acked-by" line for me (since I reviewed and approve of the change): Acked-by: John Szakmeister HTH! -John -- To unsubscribe from this list: send the line "unsubscribe git" in the b

Re: [PATCH] credential-osxkeychain: support more protocols

rotocolTypeSSH; > else /* we don't yet handle other protocols */ > exit(0); This looks pretty good, except the last one raises a question. I'm using Mac OS X, and ssh already interacts with keychain to get my SSH key password. Is th

Re: first parent, commit graph layout, and pull merge direction

On Fri, May 24, 2013 at 4:29 AM, John Keeping wrote: [snip] > Note that in my email that started this, I tried to be clear that I was > talking about "git pull" *without a branch name*. If this user > explicitly says "git pull remote branch" then I consider that a clear > indication that they rea

Re: first parent, commit graph layout, and pull merge direction

On Thu, May 23, 2013 at 5:06 AM, Andreas Krey wrote: [snip] > ... >> Don't do that, then. > > :-) Problem is, in this case 'I' expands to about > 1<<7 people I need to educate on this. This is a feature of `git pull` that I really despise. I really wish `git pull` treated the remote as the f

Re: Reading commit objects

246\x00tree 2abfe1a7bedb29672a223a5c5f266b7dc70a8d87\nparent 0636e7ff6b79470b0cd53ceacea88e7796f202ce\nauthor John Szakmeister 1369168481 -0400\ncommitter John Szakmeister 1369168481 -0400\n\nGot a file listing.\n' So at least creating the commits with Git, I see a tree. How was the commit you'

Re: [PATCH 3/4] {fast-export,transport-helper}: style cleanups

On Thu, May 9, 2013 at 4:50 AM, Felipe Contreras wrote: > On Thu, May 9, 2013 at 3:46 AM, John Szakmeister wrote: >> On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras [snip] >>> @@ -289,13 +289,13 @@ static void handle_commit(struct commit *commit, >&g

Re: [PATCH 4/4] fast-export: trivial cleanup

On Thu, May 9, 2013 at 4:53 AM, Felipe Contreras wrote: [snip] >>> @@ -562,9 +561,7 @@ static void handle_tags_and_duplicates(struct >>> string_list *extra_refs) >>> break; >>> case OBJ_COMMIT: >>> /* create refs pointing to already

Re: [PATCH 4/4] fast-export: trivial cleanup

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras wrote: > Cast the object to a commit, only to get the object back? > > Signed-off-by: Felipe Contreras > --- > builtin/fast-export.c | 5 + > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/builtin/fast-export.c b/builtin/fast-

Re: [PATCH 3/4] {fast-export,transport-helper}: style cleanups

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras > --- > builtin/fast-export.c | 24 > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/builtin/fast-export.c b/builtin/fast-export.c > index d60d675..8091354 10064

Re: Pitfalls in auto-fast-forwarding heads that are not checked out?

On Sat, May 4, 2013 at 7:35 AM, Martin Langhoff wrote: [snip] > When I do git pull, git is careful to only update the branch I have > checked out (if appropriate). It leaves any other branches that track > branches on the remote that has just been fetched untouched. I always > thought that at some

Re: git log -p unexpected behaviour - security risk?

On Tue, Apr 30, 2013 at 1:05 PM, Matthieu Moy wrote: > Junio C Hamano writes: > >> By the way, these options are _not_ about "showing merge commits >> that introduce code", and they do not help your kind of "security". >> As I repeatedly said, you would need "-p -m" for that. > > Actually, while

Re: git log -p unexpected behaviour - security risk?

On Tue, Apr 30, 2013 at 12:37 PM, Junio C Hamano wrote: > John Szakmeister writes: > >>> When I added -c/--cc, I contemplated making -p imply --cc, but >>> decided against it primarily because it is a change in traditional >>> behaviour, and it is easy for use

Re: git log -p unexpected behaviour - security risk?

On Sun, Apr 21, 2013 at 2:42 PM, Junio C Hamano wrote: > Jonathan Nieder writes: > >> The thing is, I'm not convinced this is a bad default. "Shows no diff >> at all for merges" is easy for a person to understand. It is much >> easier to understand its limitations than -c and --cc. > > Making "

Re: consistency problem on ZFS

On Sun, Apr 28, 2013 at 3:11 PM, Yann Hodique wrote: > Hi, > > I have a weird problem that seems to manifest itself only on ZFS > (actually the Zevo distribution, on OSX). With git 1.8.2.1 by the way. > I just switched to ZFS, so I can't blame that particular version of git. > > "Sometimes" (I'd s

Re: [PATCH v2 7/9] remote-bzr: tell bazaar to be quiet

On Thu, Apr 25, 2013 at 8:08 PM, Felipe Contreras wrote: > Otherwise we get notification, progress bars, and what not. > > Signed-off-by: Felipe Contreras > --- > contrib/remote-helpers/git-remote-bzr | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/contrib/remote-helpers/git-remote-b

Re: [PATCH v2 6/9] remote-bzr: store converted URL

On Thu, Apr 25, 2013 at 8:08 PM, Felipe Contreras wrote: > Mercurial might convert the URL to something more appropriate, like an > absolute path. Lets store that instead of the original URL, which won't > work from a different working directory if it's relative. > > Signed-off-by: Felipe Contrera

Re: Is there a way to speed up remote-hg?

On Sat, Apr 20, 2013 at 7:07 PM, Felipe Contreras wrote: > On Sat, Apr 20, 2013 at 6:07 AM, John Szakmeister > wrote: >> I really like the idea of remote-hg, but it appears to be awfully slow >> on the clone step: > > The short answer is no. I do have a couple

Is there a way to speed up remote-hg?

I really like the idea of remote-hg, but it appears to be awfully slow on the clone step: ... progress revision 81499 'master' (81500/81664) progress revision 81599 'master' (81600/81664) Checking out files: 100% (3744/3744), done. git clone hg::https://bitbucket.org/python_mir

Re: [PATCH] git-web--browse: recognize iTerm as a GUI terminal on OS X

On Wed, Mar 27, 2013 at 10:43 AM, Junio C Hamano wrote: [snip] > If that approach is better than what you originally sent, then yes. > > But I do not use OS X, so you may need to pay attention to possible > complaints and comments from other Mac users on this list for a > while---there may be peop

Re: [PATCH] git-web--browse: recognize iTerm as a GUI terminal on OS X

Sorry about the repeat Junio, I meant to hit "Reply to All". On Mon, Mar 25, 2013 at 5:44 PM, Junio C Hamano wrote: [snip] > Your patch makes me wonder if > > test -n "$TERM_PROGRAM" > > without any SECURITYSESSIONID or explicit program name checks should > suffice, though. So, after dow

[PATCH] git-web--browse: recognize iTerm as a GUI terminal on OS X

least under Mac OS X 10.6.8. As a result, let's check for iTerm directly via TERM_PROGRAM. Signed-off-by: John Szakmeister --- On Sun, Mar 24, 2013 at 10:05:53PM +0100, Christian Couder wrote: [snip] > Your patch looks good to me, and I cannot really test it as I don't have a >

Re: Bug: git web--browse doesn't recognise browser on OS X

is that this issue has only arisen recently, earlier > this worked fine for me The following patch fixes the issue by recognizing iTerm2 as a GUI terminal. -John >From 5d282325f9374b25609a8704661c252304b4d18a Mon Sep 17 00:00:00 2001 Date: Fri, 22 Mar 2013 13:23:07 -0400 Subject: [P

Re: rebase: strange failures to apply patc 3-way

On Mon, Mar 11, 2013 at 8:29 PM, Max Horn wrote: [snip] > > sudo launchctl unload /System/Library/LaunchDaemons/com.apple.revisiond.plist > > -> this exits revisiond, and prevents launchd from respawning it. After that, > the problem is gone, on several attempts. And once I reactivate revisions,

Re: Credentials and the Secrets API...

On Wed, Feb 20, 2013 at 12:01 PM, Ted Zlatanov wrote: > On Sat, 9 Feb 2013 05:58:47 -0500 John Szakmeister > wrote: [snip] > > JS> Yes, I think it has. Several other applications appear to be using > JS> it, including some things considered "core" in Fed

Re: Credentials and the Secrets API...

On Thu, Feb 7, 2013 at 9:46 AM, Ted Zlatanov wrote: > On Thu, 27 Oct 2011 12:05:03 -0400 John Szakmeister > wrote: > > JS> Just wanted to keep folks in the loop. It turns out that the Secrets > JS> API is still to young. I asked about the format to store credential

Re: Pretty pictures of git merge conflicts

On Thu, Jan 3, 2013 at 11:37 AM, Michael Haggerty wrote: > Hi, > > I've been thinking lately about how to attack difficult git merge > conflicts. The first step is to visualize them. I have written some > articles [1,2,3] describing a way to atomize a complicated merge and > efficiently compute

Re: [PATCH 8/8] t9402: Use TABs for indentation

On Sun, Dec 9, 2012 at 5:01 AM, Torsten Bögershausen wrote: [snip] > PS: for some reason I don't get any mails to my > (google) account any more, which I use to read the list. > Am I the only one having this problem? I noticed that the kernel.org lists are pretty unaccommodating. If something hi

Re: Bizarre problem cloning repo from Codeplex

On Sat, Nov 10, 2012 at 2:49 AM, Enrico Weigelt wrote: [snip] > Their webserver seems to be configured quite restrictively > (eg. cannot access files like 'packed-refs'). > > Is there a way to trace the actual HTTP calls ? Try GIT_CURL_VERBOSE=1. GIT_TRACE_PACKET=1 can be helpful too. -John PS

Re: Rename edge case...

On Fri, Nov 9, 2012 at 11:09 AM, Jeff King wrote: [snip] > Right. If the source didn't go away, it would be a copy. We can do copy > detection, but it is not quite as obvious what a merge should do with a > copy (apply the change to the original? To the copy? In both places? You > would really wan

Re: Rename edge case...

On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky wrote: [snip] > When merging two branches, git only looks at the tips. It doesn't inspect > their histories to see how the files were moved around. So i doesn't matter > whether you rename the files in a single commit or multiple commits. The > result

Rename edge case...

I've been browsing StackOverflow answering git-related questions, and ran across this one: It's a bit of an interesting situation. The user did a couple of renames in a branch: foo.txt => fooOld.txt fooNew.txt =>

Re: The config include mechanism doesn't allow for overwriting

On Tue, Oct 23, 2012 at 10:13 AM, Ævar Arnfjörð Bjarmason wrote: [snip] > And git config --get foo.bar will give you: > > $ git config -f /tmp/test --get foo.bar > one > error: More than one value for the key foo.bar: two > error: More than one value for the key foo.bar: three > >

Re: [msysGit] Re: Git for Windows and line endings

On Fri, Oct 19, 2012 at 10:39 AM, Chris B wrote: [snip] > - Windows has been able to cope with UNIX line endings a long time; no > developer is using a default Notepad to open files with high > expectations. Any Windows development tool and editor worth anything > I've used is able to handle both

Re: Backlight control broken between 3.6.0-rc1 and 3.6.0-rc4

On Sun, Sep 16, 2012 at 5:30 AM, Grant wrote: > I have a Dell XPS 13 Ultrabook laptop. Backlight control used to be > broken, it works in 3.6.0-rc1, and it is broken again in 3.6.0-rc4. Wrong list. You probably meant to send this to the kernel mailing list. -John -- To unsubscribe from this li