Re: BUG or FEATURE? Use of '/' in branch names

2014-05-03 Thread Dennis Kaarsemaker
hint) 2.0.0-rc2 has a better message already: $ git checkout -b hotfix/b2 error: 'refs/heads/hotfix' exists; cannot create 'refs/heads/hotfix/b2' fatal: Failed to lock ref for update: Not a directory -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line

Re: Should git-remote-hg/bzr be part of the core?

2014-05-12 Thread Dennis Kaarsemaker
-control.git/227750 -- Dennis Kaarsemaker http://www.kaarsemaker.net -- 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: Error fatal: not a git repository after auto packing

2014-08-12 Thread Dennis Kaarsemaker
that hook to not do anything in .git and it should be fine. -- Dennis Kaarsemaker www.kaarsemaker.net -- 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: Wishlist: git fetch --reference

2014-08-22 Thread Dennis Kaarsemaker
doing a fetch to pull in updates. Alternatively, you can use Duy's multiple-work-trees patches to safely make multiple checkouts of one repository. These patches are in next. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git

git fetch (http) hanging/failing on one specific repository, http only

2014-10-20 Thread Dennis Kaarsemaker
*guessing* I've hit some buffer limit here, given that the have/ack exchanges are increasing in size and suddenly this one is misbehaving. However I have no idea where to look next and would really appreciate some help. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list

Bug in fetch-pack causing ever-growing http requests. (Was: git fetch (http) hanging/failing on one specific repository, http only)

2014-10-21 Thread Dennis Kaarsemaker
On ma, 2014-10-20 at 16:29 +0200, Dennis Kaarsemaker wrote: Since a few days, one of our repos is causing problems during git fetch, basically git fetch over http hangs during find_common. When using ssh, this does not happen. snip things that may not be relevant. And for the hanging git

[PATCH] fetch-pack: don't resend known-common refs in find_common

2014-10-21 Thread Dennis Kaarsemaker
By not clearing the request buffer in stateless-rpc mode, fetch-pack would keep sending already known-common commits, leading to ever bigger http requests, eventually getting too large for git-http-backend to handle properly without filling up the pipe buffer in inflate_request. --- I'm still not

Re: [PATCH] fetch-pack: don't resend known-common refs in find_common

2014-10-22 Thread Dennis Kaarsemaker
On di, 2014-10-21 at 10:56 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: By not clearing the request buffer in stateless-rpc mode, fetch-pack would keep sending already known-common commits, leading to ever bigger http requests, eventually getting too

Re: [PATCH] fetch-pack: don't resend known-common refs in find_common

2014-10-26 Thread Dennis Kaarsemaker
On Wed, Oct 22, 2014 at 10:11:40AM -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: On di, 2014-10-21 at 10:56 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: By not clearing the request buffer in stateless-rpc mode, fetch

Re: [PATCH] fetch-pack: don't resend known-common refs in find_common

2014-10-26 Thread Dennis Kaarsemaker
On Wed, Oct 22, 2014 at 05:07:31PM +0700, Duy Nguyen wrote: On Wed, Oct 22, 2014 at 2:41 PM, Dennis Kaarsemaker den...@kaarsemaker.net wrote: I see two options: * Turning that interaction into a more cooperative process, with a select/poll loop * Make upload-pack buffer its entire

Re: Editing git changelog automatically

2014-10-27 Thread Dennis Kaarsemaker
On zo, 2014-10-26 at 22:27 -0700, Cong Wang wrote: My question is how to edit dozens of git commit changelogs automatically? You can use git filter-branch in --msg-filter mode. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git

[PATCH] tests: allow sha1's as part of the path

2013-06-15 Thread Dennis Kaarsemaker
When running 'make test' from a path such as .../daily-build/master@bdff0e3a374617dce784f801b97500d9ba2e4705, the logic in fuzz.sed as generated by t5105-request-pull.sh was backwards, replacing object names before replacing urls, making the test fail. Signed-off-by: Dennis Kaarsemaker den

[PATCH] GIT-VERSION-GEN: support non-standard $GIT_DIR path

2013-06-15 Thread Dennis Kaarsemaker
make and make test both work when $GIT_DIR isn't .git, but make dist included a bogus GIT-VERSION-FILE. Signed-off-by: Dennis Kaarsemaker den...@kaarsemaker.net --- I'm doing daily builds of git, using many workers and a shared git.git, with per-worker checkouts, it would be really useful

Re: [PATCH] GIT-VERSION-GEN: support non-standard $GIT_DIR path

2013-06-18 Thread Dennis Kaarsemaker
On ma, 2013-06-17 at 13:09 -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Dennis Kaarsemaker den...@kaarsemaker.net writes: I'm doing daily builds of git, using many workers and a shared git.git, with per-worker checkouts OK, so GIT_DIR is explicitly

Daily deb/rpm builds of git

2013-06-20 Thread Dennis Kaarsemaker
/Fedora_18/home:seveas:git-next.repo -O /etc/yum.repos.d/git-next.repo -- Dennis Kaarsemaker www.kaarsemaker.net -- 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?] remote prune origin interacts badly with clone --mirror and multiple remotes

2013-06-20 Thread Dennis Kaarsemaker
a warning would be welcome when adding remotes to a --mirror'ed repository. -- Dennis Kaarsemaker www.kaarsemaker.net -- 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

[PATCH] remote: make prune work for mixed mirror/non-mirror repos

2013-06-20 Thread Dennis Kaarsemaker
. Signed-off-by: Dennis Kaarsemaker den...@kaarsemaker.net --- remote.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/remote.c b/remote.c index e71f66d..863c183 100644 --- a/remote.c +++ b/remote.c @@ -1884,6 +1884,7 @@ struct stale_heads_info { struct ref

[PATCH v2] remote: make prune work for mixed mirror/non-mirror repos

2013-06-20 Thread Dennis Kaarsemaker
this from happening. Signed-off-by: Dennis Kaarsemaker den...@kaarsemaker.net --- The previous attempt only ignored refs/remotes, but that's not good enough as that will still delete tags. So let's ignore refs/tags too. The downside is that tags removed at the origin don't get removed, but prune

Re: [PATCH] remote: make prune work for mixed mirror/non-mirror repos

2013-06-20 Thread Dennis Kaarsemaker
(Sorry, I sent v2 before seeing this mail) On do, 2013-06-20 at 15:46 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: When cloning a repo with --mirror, and adding more remotes later, get_stale_heads for origin would mark all refs from other repos as stale

Re: [PATCH] remote: make prune work for mixed mirror/non-mirror repos

2013-06-20 Thread Dennis Kaarsemaker
themselves, so at least being able to configure prune to ignore refs/remotes/* and refs/tags/* would help me a lot. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [PATCH] remote: make prune work for mixed mirror/non-mirror repos

2013-06-20 Thread Dennis Kaarsemaker
cooking up a patch for B, as I agree that it will make things safer. I'd really like to have C as well though, would you accept a patch that implements it? -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

[PATCH 0/3] Handling overlapping refspecs slightly smarter

2013-06-21 Thread Dennis Kaarsemaker
already, another test in t5505 broke before I made both ignore exactly matching refspecs. Dennis Kaarsemaker (3): remote: Add warnings about mixin --mirror and other remotes remote: Add test for prune and mixed --mirror and normal remotes remote: don't prune when detecting overlapping refspecs

[PATCH 3/3] remote: don't prune when detecting overlapping refspecs

2013-06-21 Thread Dennis Kaarsemaker
When cloning a repo with --mirror, and adding more remotes later, get_stale_heads for origin would mark all refs from other repos as stale. There's no good way to solve, this so the best thing we can do is refusing to prune if we detect this and warning the user. Signed-off-by: Dennis Kaarsemaker

[PATCH 2/3] remote: Add test for prune and mixed --mirror and normal remotes

2013-06-21 Thread Dennis Kaarsemaker
Signed-off-by: Dennis Kaarsemaker den...@kaarsemaker.net --- t/t5505-remote.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index dd10ff0..439e996 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -428,6 +428,15 @@ test_expect_success

[PATCH 1/3] remote: Add warnings about mixin --mirror and other remotes

2013-06-21 Thread Dennis Kaarsemaker
When cloning a repo with --mirror, and adding more remotes later, get_stale_heads for origin will mark all refs from other repos as stale. Add a warning to the documentation, and warn the user when we detect such things during git remote add. Signed-off-by: Dennis Kaarsemaker den

Re: [PATCH 1/3] remote: Add warnings about mixin --mirror and other remotes

2013-06-23 Thread Dennis Kaarsemaker
, but not yet an equality check. Equality for wildcards is allowed and tested for, so do we really want to 'outlaw' equality of non-wildcard refspecs? -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH 1/3] remote: Add warnings about mixin --mirror and other remotes

2013-06-23 Thread Dennis Kaarsemaker
On zo, 2013-06-23 at 14:22 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: Equality for wildcards is allowed and tested for, so do we really want to 'outlaw' equality of non-wildcard refspecs? I am not sure what you mean by equality for wildcards

Re: [PATCH 1/3] remote: Add warnings about mixin --mirror and other remotes

2013-06-26 Thread Dennis Kaarsemaker
On zo, 2013-06-23 at 15:33 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: On zo, 2013-06-23 at 14:22 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: Equality for wildcards is allowed and tested for, so do we really want

Re: Python version auditing followup

2012-12-27 Thread Dennis Kaarsemaker
, seems like a reasonable cut-off point). -- Dennis Kaarsemaker -- 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: Segfault in git 1.8.1.5

2013-03-09 Thread Dennis Kaarsemaker
: segfault fixes and validation. -- Dennis Kaarsemaker www.kaarsemaker.net -- 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

Reading remote reflogs

2013-03-29 Thread Dennis Kaarsemaker
, it would need to somehow know the reflog of the origin. Of course a post-receive hook can send this information downstream, but I'd like to keep the origin 'dumb' and not do that. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git

Re: Reading remote reflogs

2013-03-29 Thread Dennis Kaarsemaker
On vr, 2013-03-29 at 15:45 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: ... Mirrored repositories don't maintain a reflog, even with core.logAllRefUpdates = true,... Are you sure about this? When log_all_ref_updates is not set, by default we do not log

Re: Reading remote reflogs

2013-03-29 Thread Dennis Kaarsemaker
On vr, 2013-03-29 at 15:58 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: On vr, 2013-03-29 at 15:45 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: ... Mirrored repositories don't maintain a reflog, even

Re: GIT_DIR not auto ignored

2013-12-01 Thread Dennis Kaarsemaker
in what will be committed) .foo/ nothing added to commit but untracked files present (use git add to track) (Note the absence of .git there) -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: GIT_DIR not auto ignored

2013-12-01 Thread Dennis Kaarsemaker
On zo, 2013-12-01 at 19:08 +0100, Dennis Kaarsemaker wrote: On za, 2013-11-30 at 23:06 -0800, Ingy dot Net wrote: Greetings, I found this probable bug: https://gist.github.com/anonymous/01979fd9e6e285df41a2 Summary: $ mv .git .foo $ export GIT_DIR=$PWD/.foo $ git status

[PATCH] path_treatment: also ignore $GIT_DIR if it's not .git

2013-12-01 Thread Dennis Kaarsemaker
We always ignore anything named .git, but we should also ignore the git directory if the user overrides it by setting $GIT_DIR Reported-By: Ingy döt Net i...@ingy.net Signed-off-by: Dennis Kaarsemaker den...@kaarsemaker.net --- dir.c | 2 +- t/t7508-status.sh | 7 +++ 2 files

Re: [PATCH] path_treatment: also ignore $GIT_DIR if it's not .git

2013-12-01 Thread Dennis Kaarsemaker
On ma, 2013-12-02 at 00:08 +0100, Thomas Rast wrote: Duy Nguyen pclo...@gmail.com writes: On Mon, Dec 2, 2013 at 2:04 AM, Dennis Kaarsemaker den...@kaarsemaker.net wrote: We always ignore anything named .git, but we should also ignore the git directory if the user overrides

Re: [PATCH] path_treatment: also ignore $GIT_DIR if it's not .git

2013-12-02 Thread Dennis Kaarsemaker
On ma, 2013-12-02 at 07:38 +0700, Duy Nguyen wrote: On Mon, Dec 2, 2013 at 6:38 AM, Dennis Kaarsemaker den...@kaarsemaker.net wrote: On ma, 2013-12-02 at 00:08 +0100, Thomas Rast wrote: Duy Nguyen pclo...@gmail.com writes: On Mon, Dec 2, 2013 at 2:04 AM, Dennis Kaarsemaker den

Re: [PATCH] path_treatment: also ignore $GIT_DIR if it's not .git

2013-12-02 Thread Dennis Kaarsemaker
On ma, 2013-12-02 at 16:35 +0700, Duy Nguyen wrote: On Mon, Dec 2, 2013 at 3:01 PM, Dennis Kaarsemaker den...@kaarsemaker.net wrote: On ma, 2013-12-02 at 07:38 +0700, Duy Nguyen wrote: On Mon, Dec 2, 2013 at 6:38 AM, Dennis Kaarsemaker den...@kaarsemaker.net wrote: On ma, 2013-12-02

Re: Can we stage all files using git add command, except some specific files ?

2014-05-26 Thread Dennis Kaarsemaker
the files from the current directory, except some specific files. No, there is no such option to do that, but you could use git add --interactive and use its interface to quickly pick the files you want to add. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line

Re: Bug in shallow clone?

2014-05-28 Thread Dennis Kaarsemaker
something up again.. 2.0.0-rc4 does this correctly. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- 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: [BUG REPORT] Git log pretty date

2014-05-29 Thread Dennis Kaarsemaker
refuses to parse them. -- Dennis Kaarsemaker www.kaarsemaker.net -- 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

[PATCH] Makefile: don't hardcode HEAD in dist target

2014-05-31 Thread Dennis Kaarsemaker
Instead of calling git-archive HEAD^{tree}, use $(GIT_VERSION)^{tree}. This makes sure the archive name and contents are consistent, if HEAD has moved, but GIT-VERSION-FILE hasn't been regenerated yet. Signed-off-by: Dennis Kaarsemaker den...@kaarsemaker.net --- I have a somewhat odd setup

Re: [PATCH] Makefile: don't hardcode HEAD in dist target

2014-06-02 Thread Dennis Kaarsemaker
On Mon, Jun 02, 2014 at 11:53:36AM -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: Instead of calling git-archive HEAD^{tree}, use $(GIT_VERSION)^{tree}. This makes sure the archive name and contents are consistent, if HEAD has moved, but GIT-VERSION-FILE

Re: [BUG REPORT] Git log pretty date

2014-06-03 Thread Dennis Kaarsemaker
wrong than what git does. It displays the timestamp subtly wrong (off by 7 hours) instead of making it completely clear that the timestamp is bogus. -- Dennis Kaarsemaker den...@kaarsemaker.net http://twitter.com/seveas -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH v5 00/28] Support multiple checkouts

2014-07-07 Thread Dennis Kaarsemaker
is very limited. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- 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 v6 00/32] Support multiple checkouts

2014-07-11 Thread Dennis Kaarsemaker
Tested-by: Dennis Kaarsemaker den...@kaarsemaker.net I've been using this branch for a little while now and have no breakages to report. Max Kirillov reported some bugs in the interaction with submodules which I plan to chase when I have some time unless someone beats me to it :) On wo, 2014-07

Re: [PATCH] checkout: indicate when a detached head is checked out for a branch

2014-07-18 Thread Dennis Kaarsemaker
already on a detached HEAD) in multiple different places to run independent actions (e.g. make test with different compiler options, or creating several different packages) and I would really appreciate it if that would keep working. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from

Re: Is there a way to mark a branch as published?

2014-08-01 Thread Dennis Kaarsemaker
contain the tip of a branch: git branch -a --contains yourbranchnamehere | grep remotes/ That doesn't say anything about remotes you don't know about of course. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: Bug report about symlinks

2014-08-01 Thread Dennis Kaarsemaker
deleted file mode 100644 index d00491f..000 --- a/dir2/1.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/dir2/2.txt b/dir2/2.txt deleted file mode 100644 index b8a4cf4..000 --- a/dir2/2.txt +++ /dev/null @@ -1 +0,0 @@ -2b -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from

Re: [PATCH 0/3] nd/multiple-work-trees updates

2015-02-13 Thread Dennis Kaarsemaker
://github.com/seveas/git/tree/nd/multiple-work-trees ) -- Dennis Kaarsemaker http://www.kaarsemaker.net -- 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

'make test' fails in pu

2015-02-17 Thread Dennis Kaarsemaker
wondering: - Should I even mention that it's failing, or is that just useless noise? - If I should report this, I could also make my testing thing send mails. Would that be useful? -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git

Re: [RFH] GSoC 2015 application

2015-02-20 Thread Dennis Kaarsemaker
/dennis/.config/git/foobar So, ~/.$filename or $XDG_CONFIG_HOME/git/filename, with a special case only for git itself, with consistent selection of which to use (currently gitk and git are inconsistent). -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send

Re: How to rebase one branch of the merge commit?

2015-02-01 Thread Dennis Kaarsemaker
-- Dennis Kaarsemaker www.kaarsemaker.net -- 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: FW: Time Date on file

2015-03-17 Thread Dennis Kaarsemaker
On di, 2015-03-17 at 13:19 -0400, Patrice Monette wrote: I did not find any config, but is there one configuration somewhere to preserve the real date creation by author somewhere? No, there is no such configuration as git does not track timestamps of files. -- Dennis Kaarsemaker

Re: [PATCH] clone: Warn if clone lacks LICENSE or COPYING file

2015-03-21 Thread Dennis Kaarsemaker
- and the cloner may not be expecting that. Please no, especially not without an option to switch this off. Git is not only used in open source settings, this would be highly annoying at $work, where no repo has (or needs) such a file. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from

Re: Git Newbie - GSoC mini Project

2015-03-03 Thread Dennis Kaarsemaker
to change this). For the second step, you'll need to find the bit of code where the -C option is handled and add a special case for the empty string to do what came out of the discussion about wanted behavior. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line

Re: [cosmetic bug?] needlessly(?) executable files

2015-02-23 Thread Dennis Kaarsemaker
). -- Dennis Kaarsemaker http://www.kaarsemaker.net -- 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: support git+mosh for unreliable connections

2015-04-15 Thread Dennis Kaarsemaker
. More about mosh https://mosh.mit.edu/ mosh isn't a generic transport though, it's a udp-based session state synchronization protocol. I don't think it can be used as a git transport. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git

Re: support git+mosh for unreliable connections

2015-04-15 Thread Dennis Kaarsemaker
then communicate via a custom UDP protocol. The SSH connection is closed after the mosh-server has been launched as it is no longer needed. The communication between the mosh client and server synchronizes terminal state, somewhat like what screen/tmux do. -- Dennis Kaarsemaker

assert failed in submodule edge case

2015-04-13 Thread Dennis Kaarsemaker
' a submodule. So I have no idea how to proceed, or even what the correct behaviour of 'git add' should be in this case. I do think that failing an assert() to tell a user he's doing something unexpected/silly/wrong isn't the right thing to do though :) -- Dennis Kaarsemaker www.kaarsemaker.net

Re: assert failed in submodule edge case

2015-04-13 Thread Dennis Kaarsemaker
Err, ignore the 'segfault' bits. It's an assert() failure. He called it a segfault at first and that got stuck in my head. On ma, 2015-04-13 at 18:55 +0200, Dennis Kaarsemaker wrote: Reported by djanos_ in #git: git add segfaults when you manage to confuse it with a submodule in the index

Re: [PATCH v2] pull: handle --log=n

2015-05-20 Thread Dennis Kaarsemaker
reason, undetectedly (ref does not exist instead of can't handle ref) - same for TODO tests -- Dennis Kaarsemaker www.kaarsemaker.net -- 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

Re: Minor bug report

2015-06-03 Thread Dennis Kaarsemaker
helpful messages when a repo is empty. I think you are growing bitter with age ;) -- Dennis Kaarsemaker www.kaarsemaker.net -- 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

incomplete footers added by list server?

2015-06-23 Thread Dennis Kaarsemaker
://vger.kernel.org/majordomo-info.html Only the first line is now added, actually making it fairly useless :) -- Dennis Kaarsemaker http://www.kaarsemaker.net -- 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

Re: RFC: reverse history tree, for faster background clones

2015-06-12 Thread Dennis Kaarsemaker
On vr, 2015-06-12 at 13:39 +0200, Andres G. Aragoneses wrote: On 12/06/15 13:33, Dennis Kaarsemaker wrote: On vr, 2015-06-12 at 13:26 +0200, Andres G. Aragoneses wrote: AFAIU git stores the contents of a repo as a sequence of patches in the .git metadata folder. It does not, it stores

Re: RFC: reverse history tree, for faster background clones

2015-06-12 Thread Dennis Kaarsemaker
--depth=1 and subsequent fetches in the background to deepen the history. I can see some value in clone doing this by itself, first doing a depth=1 fetch, then launching itself into the background, giving you a worktree to play with earlier. -- Dennis Kaarsemaker http://www.kaarsemaker.net

[Bug] incomplete defence agains creating a branch named HEAD

2015-08-05 Thread Dennis Kaarsemaker
or not git should allow branches named '@' I don't have an opinion on, I know '@' is pretty special when dealing with refs. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: git branch -v output ambiguous for parser

2015-07-23 Thread Dennis Kaarsemaker
On do, 2015-07-23 at 15:29 +0200, Thibault Kruse wrote: Hi, trying to write a git wrapper, I wanted to parse the output of git branch -v The output of git branch is not meant to be machine-parsed. Try using git for-each-ref :) -- Dennis Kaarsemaker http://www.kaarsemaker.net

Re: git-gui is still using old-style git-merge invocation

2015-10-29 Thread Dennis Kaarsemaker
changed, 1 insertion(+) > create mode 100644 a > > But I am unable to find where the invocation happens. Can somebody > help? git-gui/lib/merge.tcl, method _start The command is constructed on lines 115-120 (master as of today, 37023ba3) -- Dennis Kaarsemaker www.kaarsemaker.net

[PATCH] t5813: avoid creating urls that break on cygwin

2015-11-08 Thread Dennis Kaarsemaker
or helpers, but that's for another topic as it could cause regressions. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- t/t5813-proto-disable-ssh.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5813-proto-disable-ssh.sh b/t/t5813-proto-disable-

[PATCH] t5813: avoid creating urls that break on cygwin

2015-11-09 Thread Dennis Kaarsemaker
to actually fix this in git itself, making it remove extra slashes from urls before feeding them to transports or helpers, but that's for another topic as it could cause regressions. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- You're right of course. Somehow I reme

[PATCH] check-ignore: correct documentation about output

2015-11-08 Thread Dennis Kaarsemaker
By default git check-ignore shows only the filenames that will be ignored, not the pattern that causes their exclusion. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- Documentation/git-check-ignore.txt | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff

Re: gitk fails to start after upgrading to 2.6.3 (cannot load translation)

2015-11-10 Thread Dennis Kaarsemaker
e in git 2.7. -- Dennis Kaarsemaker www.kaarsemaker.net -- 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] check-ignore: correct documentation about output

2015-11-16 Thread Dennis Kaarsemaker
Ping. On zo, 2015-11-08 at 21:10 +0100, Dennis Kaarsemaker wrote: > By default git check-ignore shows only the filenames that will be > ignored, not the pattern that causes their exclusion. > > Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> > --- > Documentat

Re: how to check for uncommitted/unstaged changes on remote side before pushing

2015-11-09 Thread Dennis Kaarsemaker
git archive and symlink trickery for even better deploys Questions like this come up in #git all the time, so I wrote up a few more detailed recipes here, including working hooks and config for all three ways of deploying: http://git.seveas.net/simple-deployments-with-git.html -- Dennis Kaarsemak

Re: how to check for uncommitted/unstaged changes on remote side before pushing

2015-11-09 Thread Dennis Kaarsemaker
hub.com/RichiH/vcsh/) in combination with a .bashrc.d snippet that updates dotfiles upon login when possible ( https://github.com/seveas/dotfiles/blob/master/.bashrc.d/vcsh.sh) -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in th

Re: Bug: t5813 failing on Cygwin

2015-11-07 Thread Dennis Kaarsemaker
,7 @@ test_expect_success 'setup repository to clone' ' ' test_proto "host:path" ssh "remote:repo.git" -test_proto "ssh://" ssh "ssh://remote/$PWD/remote/repo.git" -test_proto "git+ssh://" ssh "git+ssh://remote/$PWD/remote/repo.git" +test_proto "ssh://" ssh "ssh://remote$PWD/remote/repo.git" +test_proto "git+ssh://" ssh "git+ssh://remote$PWD/remote/repo.git" test_done -- Dennis Kaarsemaker www.kaarsemaker.net -- 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: Bug: t5813 failing on Cygwin

2015-11-07 Thread Dennis Kaarsemaker
On za, 2015-11-07 at 23:05 +, Ramsay Jones wrote: > > On 07/11/15 21:21, Ramsay Jones wrote: > > > > > > On 07/11/15 21:02, Dennis Kaarsemaker wrote: > > > On za, 2015-11-07 at 19:20 +, Adam Dinwoodie wrote: > > > > On Sat, Nov

[PATCH] git-p4: import the ctypes module

2015-10-20 Thread Dennis Kaarsemaker
The ctypes module is used on windows to calculate free disk space, so it must be imported. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> --- git-p4.py | 1 + 1 file changed, 1 insertion(+) On di, 2015-10-20 at 09:00 -0700, Junio C Hamano wrote: > Luke Diamand <l...

Reset sometimes updates mtime

2015-07-09 Thread Dennis Kaarsemaker
further (e.g. I don't even know yet if the file gets rewritten or just touched, why the index gets updated as well etc.). -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: Reset sometimes updates mtime

2015-07-10 Thread Dennis Kaarsemaker
On do, 2015-07-09 at 10:56 -0700, Junio C Hamano wrote: Dennis Kaarsemaker den...@kaarsemaker.net writes: I'm seeing some behaviour with git reset that I find odd. Basically if I do git fetch \ git reset --hard simple-tag-that-points-to-the-current-commit sometimes the reset

Re: [PATCH v2 43/43] refs: tests for db backend

2015-10-03 Thread Dennis Kaarsemaker
l git update-ref -d refs/heads/self test_must_fail: command succeeded: git update-ref -d refs/heads/self not ok 18 - update-ref -d is not confused by self-reference # # git symbolic-ref refs/heads/self refs/heads/self && # test_when_finished "delete_ref refs/heads/self&q

Re: [RFC/PATCH v1] Add Travis CI support

2015-10-04 Thread Dennis Kaarsemaker
one of git/git with a different ci system enabled, and it hasn't really caught anything. Only the occasional test failure in pu like the one I mailed about yesterday. The automated testing of pull requests could be useful, but pull requests don't seem to be used much yet. -- Dennis Kaarsemaker www.k

Re: [RFC/PATCH v1] Add Travis CI support

2015-10-04 Thread Dennis Kaarsemaker
gt; I am wondering if that can be an avenue for a possible mischief. The latter. And it can, as it can enable notifications. -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.ke

Re: [RFC/PATCH v1] Add Travis CI support

2015-09-24 Thread Dennis Kaarsemaker
ere it can put "this commit failed tests"), repository hooks (to set up build triggers), team membership (ro) and email addresses (ro). -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to ma

Push --follow tags does not agree with its documentation

2015-12-04 Thread Dennis Kaarsemaker
), 166 bytes | 0 bytes/s, done. Total 1 (delta 0), reused 1 (delta 0) To /tmp/whelk.git/ - [deleted] 2.5 * [new tag] v2.5.1 -> v2.5.1 Which one is correct in this case, the behaviour or the documentation? -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this l

Re: Corruption of branch?

2015-12-14 Thread Dennis Kaarsemaker
On ma, 2015-12-14 at 14:59 -0500, Thomas Nyberg wrote: > I'm guessing you're looking for namecollisions of some kind? I was thinking the same. Can you share the (sanitised) output of git for-each-ref? -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the l

Re: Corruption of branch?

2015-12-14 Thread Dennis Kaarsemaker
of DWIM'ing 'git checkout frus' to 'git checkout -b frus origin/frus' -- Dennis Kaarsemaker www.kaarsemaker.net -- 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] Add a test for subtree rebase that loses commits

2016-01-05 Thread Dennis Kaarsemaker
l.obbligato.org. 1800IN CNAME obbligato .org. obbligato.org. 1800IN A 173.255.19 9.253 So it has an MX record, it's just incorrect: MX records must not point to things that are CNAMEs. -- Dennis Kaarsemaker http://www.kaarsemaker.net -- To unsubscribe

Re: [PATCH v3] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-31 Thread Dennis Kaarsemaker
On wo, 2015-12-30 at 16:02 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > diff --git a/reflog-walk.c b/reflog-walk.c > > index 85b8a54..0ebd1da 100644 > > --- a/reflog-walk.c > > +++ b/reflog-walk.c > > @@ -221,

Re: Can not 'git add file'

2016-01-03 Thread Dennis Kaarsemaker
ead is first git add -N ../lib/Devel/DebugHooks/Commands.pm to mark the file as tracked without adding content. Then git add -p will allow you to add the contents partially.-- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line "unsubscribe git" in the bo

Re: [PATCH v4] reflog-walk: don't segfault on non-commit sha1's in the reflog

2016-01-06 Thread Dennis Kaarsemaker
On di, 2016-01-05 at 20:52 -0500, Eric Sunshine wrote: > On Tue, Jan 5, 2016 at 8:28 PM, Eric Sunshine < > sunsh...@sunshineco.com> wrote: > > On Tue, Jan 5, 2016 at 8:20 PM, Dennis Kaarsemaker > > <den...@kaarsemaker.net> wrote: > > > On di, 2016-01

Re: [PATCH v3] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-31 Thread Dennis Kaarsemaker
On do, 2015-12-31 at 09:57 +0100, Dennis Kaarsemaker wrote: > > > +test_expect_success 'reflog containing non-commit sha1s displays > > > properly' ' > > > > In general, "properly" is a poor word to use in test description > (or > > a co

Re: [bug] Graph log and orphan branches

2015-12-30 Thread Dennis Kaarsemaker
s ? "*" : "^" ; else if (revs->cherry_mark) return "+"; return ""; -- Dennis Kaarsemaker www.kaarsemaker.net -- 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

[PATCH v4] reflog-walk: don't segfault on non-commit sha1's in the reflog

2016-01-05 Thread Dennis Kaarsemaker
would be to decouple git reflog from the log walker machinery. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> Helped-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com> Helped-by: Junio C Hamano <gits...@pobox.com> --- Changes since v3: tweaks to the second test. refl

Re: [PATCH v4] reflog-walk: don't segfault on non-commit sha1's in the reflog

2016-01-05 Thread Dennis Kaarsemaker
On di, 2016-01-05 at 20:05 -0500, Eric Sunshine wrote: > On Tue, Jan 5, 2016 at 4:12 PM, Dennis Kaarsemaker > <den...@kaarsemaker.net> wrote: > > git reflog (ab)uses the log machinery to display its list of log > > entries. To do so it must fake commit parent information fo

[PATCH v2] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-30 Thread Dennis Kaarsemaker
Use lookup_commit instead of parse_object to look up commits mentioned in the reflog. This avoids a segfault in save_parents if somehow a sha1 for something other than a commit ends up in the reflog. Signed-off-by: Dennis Kaarsemaker <den...@kaarsemaker.net> Helped-by: Nguyễn Thái Ngọc Duy

Re: [PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-30 Thread Dennis Kaarsemaker
On wo, 2015-12-30 at 13:20 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > diff --git a/reflog-walk.c b/reflog-walk.c > > index 85b8a54..b85c8e8 100644 > > --- a/reflog-walk.c > > +++ b/reflog-walk.c > > @@ -236,

Re: [PATCH] reflog-walk: don't segfault on non-commit sha1's in the reflog

2015-12-30 Thread Dennis Kaarsemaker
On wo, 2015-12-30 at 13:41 -0800, Junio C Hamano wrote: > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > On wo, 2015-12-30 at 13:20 -0800, Junio C Hamano wrote: > > > Dennis Kaarsemaker <den...@kaarsemaker.net> writes: > > > > >

  1   2   3   >