Re: git gc --aggressive led to about 40 times slower git log --raw

2014-02-19 Thread Philippe Vaucher
fwiw this is the thread that added --depth=250 http://thread.gmane.org/gmane.comp.gcc.devel/94565/focus=94626 This post is quite interesting: http://article.gmane.org/gmane.comp.gcc.devel/94637 Philippe -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: git gc --aggressive led to about 40 times slower git log --raw

2014-02-19 Thread David Kastrup
Philippe Vaucher philippe.vauc...@gmail.com writes: fwiw this is the thread that added --depth=250 http://thread.gmane.org/gmane.comp.gcc.devel/94565/focus=94626 This post is quite interesting: http://article.gmane.org/gmane.comp.gcc.devel/94637 Yes. Of course I am prejudiced because I

Re: [PATCH] Git release notes man page

2014-02-19 Thread Stefan Näwe
Am 18.02.2014 23:54, schrieb Philip Oakley: From: Junio C Hamano gits...@pobox.com I do not understand why it is even a good idea to show release notes from the command line git interface. My looking at this came from Stefan's suggestion noted above $gmane/240595. So it had at least one

Re: [PATCH] rev-parse: fix --resolve-git-dir argument handling

2014-02-19 Thread John Keeping
On Tue, Feb 18, 2014 at 04:25:37PM -0800, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: John Keeping j...@keeping.me.uk writes: There are two problems here: 1) If no argument is provided, then the command segfaults 2) The argument is not consumed, so there will be

Re: git gc --aggressive led to about 40 times slower git log --raw

2014-02-19 Thread Duy Nguyen
On Wed, Feb 19, 2014 at 3:38 PM, Philippe Vaucher philippe.vauc...@gmail.com wrote: fwiw this is the thread that added --depth=250 http://thread.gmane.org/gmane.comp.gcc.devel/94565/focus=94626 This post is quite interesting: http://article.gmane.org/gmane.comp.gcc.devel/94637 Especially

Re: git gc --aggressive led to about 40 times slower git log --raw

2014-02-19 Thread Duy Nguyen
On Wed, Feb 19, 2014 at 4:01 PM, David Kastrup d...@gnu.org wrote: Calling git blame via C-x v g is a rather important part of the workflow, and it's currently intolerable to work with on a number of files. While I'm fixing the basic shortcomings in builtin/blame.c itself, the operation

HI

2014-02-19 Thread Aminata Conteh
Hello dear My name is Aminata Conteh, am 26 years of age, and I will like to build a relationship with you that will lead us for a better tomorrow to enable us share many feelings with each other as soul mate because it would be my pleasure to receive your positive respond towards my proposal

Using git reset in a pre-commit hook can create an empty commit

2014-02-19 Thread Gunnar Strand
Hi, git version 1.8.4.2 Linux 3.0.74-0.6.8-xen git commit does not properly reevaluate the state after the pre-commit hook has been executed, and lists files which have been reset as part of the commit, and will create an empty commit, despite that no --allow-empty was given. Steps to

[PATCH] tag: support --sort=version

2014-02-19 Thread Nguyễn Thái Ngọc Duy
--sort=version sorts tags as versions. GNU extension's strverscmp is used and no real compat implementation is provided so this is Linux only. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- I didn't know that coreutils' sort is simply a wrapper of strverscmp. With that GNU extension,

Re: [PATCH] tag: support --sort=version

2014-02-19 Thread Jeff King
On Wed, Feb 19, 2014 at 08:39:27PM +0700, Nguyễn Thái Ngọc Duy wrote: --sort=version sorts tags as versions. GNU extension's strverscmp is used and no real compat implementation is provided so this is Linux only. Sounds like a good goal. I wonder, if we were to merge the for-each-ref and tag

Re: [PATCH] tag: support --sort=version

2014-02-19 Thread Duy Nguyen
On Wed, Feb 19, 2014 at 9:09 PM, Jeff King p...@peff.net wrote: On Wed, Feb 19, 2014 at 08:39:27PM +0700, Nguyễn Thái Ngọc Duy wrote: --sort=version sorts tags as versions. GNU extension's strverscmp is used and no real compat implementation is provided so this is Linux only. Sounds like a

Re: [PATCH] Git release notes man page

2014-02-19 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: RelNotes are incremental and only useful for those who know what the immediately previous release contained, but for most people who get their Git from distros, I have this impression that the versions of Git they get skip versions, and seeing the

Re: [PATCH] tag: support --sort=version

2014-02-19 Thread Eric Sunshine
On Wed, Feb 19, 2014 at 8:39 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: --sort=version sorts tags as versions. GNU extension's strverscmp is used and no real compat implementation is provided so this is Linux only. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- diff --git

release-notes could be clearer on git-fetch changes

2014-02-19 Thread Jan Engelhardt
Greetings. The release notes for 1.9.0 read: * The --tags option to git fetch no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same command line without the option. I think the release notes should also say -- like it

Re: git gc --aggressive led to about 40 times slower git log --raw

2014-02-19 Thread Junio C Hamano
Philippe Vaucher philippe.vauc...@gmail.com writes: fwiw this is the thread that added --depth=250 http://thread.gmane.org/gmane.comp.gcc.devel/94565/focus=94626 This post is quite interesting: http://article.gmane.org/gmane.comp.gcc.devel/94637 Yes, it most clearly says that --depth=250

Re: [PATCH] gitweb: Avoid overflowing page body frame with large images

2014-02-19 Thread Junio C Hamano
Andrew Keller and...@kellerfarm.com writes: When displaying a blob in gitweb, if it's an image, specify constraints for maximum display width and height to prevent the image from overflowing the frame of the enclosing page_body div. This change assumes that it is more desirable to see the

Re: [PATCH v2 1/3] revert.c: Allow to specify -x via git-config

2014-02-19 Thread Junio C Hamano
Guido Günther a...@sigxcpu.org writes: Without this when maintaining stable branches it's easy to forget to use -x to track where a patch was cherry-picked from. --- Documentation/config.txt | 4 Documentation/git-cherry-pick.txt | 8 builtin/revert.c

Re: release-notes could be clearer on git-fetch changes

2014-02-19 Thread Junio C Hamano
Jan Engelhardt jeng...@inai.de writes: The release notes for 1.9.0 read: * The --tags option to git fetch no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same command line without the option. I think the release

Re: [PATCH] blame: add a failing test for a CRLF issue.

2014-02-19 Thread Torsten Bögershausen
On 02/18/2014 08:45 PM, brian m. carlson wrote: If a file contains CRLF line endings in a repository with core.autocrlf=input, then blame always marks the lines as Not Committed Yet, even if they are unmodified. Add a failing test for this case, so we are at least aware of this issue.

Re: [PATCH v3 14/25] setup.c: convert is_git_directory() to use strbuf

2014-02-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- (Only minor nits first during this round of review) diff --git a/strbuf.h b/strbuf.h index 73e80ce..aec9fdb 100644 --- a/strbuf.h +++ b/strbuf.h @@ -116,6 +116,10 @@ extern void

Re: [PATCH v3 18/25] setup.c: support multi-checkout repo setup

2014-02-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: (Only nitpicks during this round of review). diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 8f36aa9..d8bdaf4 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -346,4 +346,80 @@ test_expect_success 'relative

Re: [PATCH v3 23/25] checkout: detach if the branch is already checked out elsewhere

2014-02-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: The normal rule is anything outside refs/heads/ is detached. This strictens the rule a bit more: if the branch is checked out (either in $GIT_COMMON_DIR/HEAD or any $GIT_DIR/repos/.../HEAD) then it's detached as well. A hint is given so the

Re: [PATCH v3 25/25] gc: support prune --repos

2014-02-19 Thread Junio C Hamano
(Only nitpicks during this round of review). @@ -274,6 +284,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) argv_array_pushl(reflog, reflog, expire, --all, NULL); argv_array_pushl(repack, repack, -d, -l, NULL); argv_array_pushl(prune, prune, --expire, NULL

Re: [PATCH v3 01/25] path.c: make get_pathname() return strbuf instead of static buffer

2014-02-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: (Only nitpicks during this round of review). -static char *get_pathname(void) +static struct strbuf *get_pathname() static struct strbuf *get_pathname(void) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: [PATCH v3 24/25] prune: strategies for linked checkouts

2014-02-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: (Only nitpicks during this round of review). + if (get_device_or_die(path) != get_device_or_die(get_git_dir())) { + strbuf_reset(sb); + strbuf_addf(sb, %s/locked, sb_repo.buf); + write_file(sb.buf, 1,

Re: [PATCH 0/6] inotify support

2014-02-19 Thread Shawn Pearce
On Sun, Jan 12, 2014 at 3:03 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: It's been 37 weeks since Robert Zeh's attempt to bring inotify support to Git [1] and unless I missed some mails, no updates since. So here's another attempt with my preferred approach (can't help it, playing with

Re: [PATCH v3 24/25] prune: strategies for linked checkouts

2014-02-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: (Only nitpicks during this round of review). +if (get_device_or_die(path) != get_device_or_die(get_git_dir())) { +strbuf_reset(sb); +strbuf_addf(sb, %s/locked, sb_repo.buf);

Re: [PATCH v3 00/25] Support multiple checkouts

2014-02-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: In short you can attach multiple worktrees to the same git repository with git checkout --to somewhere. This is basically what git-new-workdir is for. This is exciting. I'll be pushing this out on 'pu' (with trivial fix-ups squashed in and/or

What's cooking in git.git (Feb 2014, #06; Wed, 19)

2014-02-19 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The tip of 'next' hasn't been rewound, and none of the topics that have been cooking there has graduated, yet. Hopefully that can start

Re: [PATCH v3 23/25] checkout: detach if the branch is already checked out elsewhere

2014-02-19 Thread Eric Sunshine
On Tue, Feb 18, 2014 at 8:40 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The normal rule is anything outside refs/heads/ is detached. This strictens the rule a bit more: if the branch is checked out (either in s/strictens/increases strictness of/ $GIT_COMMON_DIR/HEAD or any

Re: [PATCH v3 24/25] prune: strategies for linked checkouts

2014-02-19 Thread Eric Sunshine
On Tue, Feb 18, 2014 at 8:40 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The pruning rules are: - if $REPO/locked exists, repos/id is not supposed to be pruned. - if $REPO/locked exists and $REPO/gitdir's mtimer is older than a s/mtimer/mtime/ really long limit, warn about old

Re: [PATCH v3 24/25] prune: strategies for linked checkouts

2014-02-19 Thread Eric Sunshine
On Wed, Feb 19, 2014 at 5:08 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Tue, Feb 18, 2014 at 8:40 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: +static dev_t get_device_or_die(const char *path) +{ + struct stat buf; + if (stat(path, buf)) +

Re: release-notes could be clearer on git-fetch changes

2014-02-19 Thread Jan Engelhardt
On Wednesday 2014-02-19 21:01, Junio C Hamano wrote: Jan Engelhardt jeng...@inai.de writes: The release notes for 1.9.0 read: * The --tags option to git fetch no longer tells the command to fetch _only_ the tags. It instead fetches tags _in addition to_ what are fetched by the same

Re: [PATCH v3 01/25] path.c: make get_pathname() return strbuf instead of static buffer

2014-02-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: We've been avoiding PATH_MAX whenever possible. This patch makes get_pathname() return a strbuf and updates the callers to take advantage of this. The code is simplified as we no longer need to worry about buffer overflow. Signed-off-by:

Re: [PATCH 0/6] inotify support

2014-02-19 Thread Duy Nguyen
On Thu, Feb 20, 2014 at 3:35 AM, Shawn Pearce spea...@spearce.org wrote: Why a new daemon? Why don't we reuse the stable https://github.com/facebook/watchman project Facebook built to make Hg's status system fast? I did look briefly through its readme before but there were a few off-factors

Re: [PATCH v3 02/25] Convert git_snpath() to strbuf_git_path()

2014-02-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: @@ -651,14 +653,10 @@ static void update_refs_for_switch(const struct checkout_opts *opts, new-name); } } - if (old-path old-name) { -

Re: [PATCH v3 02/25] Convert git_snpath() to strbuf_git_path()

2014-02-19 Thread Duy Nguyen
On Thu, Feb 20, 2014 at 6:48 AM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: @@ -651,14 +653,10 @@ static void update_refs_for_switch(const struct checkout_opts *opts, new-name); }

[no subject]

2014-02-19 Thread Bozhidar Bozhev
-- 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 v3 02/25] Convert git_snpath() to strbuf_git_path()

2014-02-19 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: - } + if (old-path old-name + !file_exists(git_path(%s, old-path)) + file_exists(git_path(logs/%s, old-path))) + remove_path(git_path(logs/%s, old-path)); Hmph. Is this

Re: [PATCH v3 02/25] Convert git_snpath() to strbuf_git_path()

2014-02-19 Thread Duy Nguyen
On Thu, Feb 20, 2014 at 10:41 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: - } + if (old-path old-name + !file_exists(git_path(%s, old-path)) + file_exists(git_path(logs/%s, old-path))) +

Re: git gc --aggressive led to about 40 times slower git log --raw

2014-02-19 Thread Christian Jaeger
2014-02-19 10:14 GMT+00:00 Duy Nguyen pclo...@gmail.com: Christian, if you want to experiment this, update MAX_DELTA_CACHE in sha1_file.c and rebuild. I don't have the time right now. (Perhaps next week?) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: error: src refspec refs/heads/master matches more than one.

2014-02-19 Thread Michael Haggerty
On 02/18/2014 08:51 PM, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: There's already the arbitrary set of prefixes in refs.c::prettify_refname() and refs.c::ref_rev_parse_rules(). I can see how a user might think that since git log refs/heads/name is equivalent to git log

filter clean leaves uncommitted file

2014-02-19 Thread shawn wilson
So, I want a way of sharing parts of a gitconfig organizationally, so I change and comment out some parts with a filter: [filter gitconfig-rmuser] clean = sed -e \s/^\\( *email =\\).*/\\1 email address/\ -e \s/^\\( *name =\\).*/\\1 real name/\ -e \s/^\\( *signingkey =\\).*/\\1 gpg key/\ And

git log omits deleting merges

2014-02-19 Thread Ephrim Khong
Hi, git log seems to omit merge commits that delete a file if --follow or --diff-filter=D is given. Below is a testcase. I'm not sure if it is desired behaviour for --diff-filter=D, but it's probably not correct that --follow _removes_ the merge commit from the log output. Thanks - Eph --