Re: [PATCH/RFC] rewrite `git_default_config()` using config-set API functions

2014-07-22 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: In general, most strings one manipulates are const char *, it's frequent to modify a pointer to a string, but rather rare to modify the string itself. We seem to have a disagreement. Unlike

Re: scan.coverity: improve the modeling file of git.git

2014-07-22 Thread Jeff King
On Sun, Jul 20, 2014 at 11:44:53PM +0200, Stefan Beller wrote: We're currently seeing lots of false positives as the xmalloc/xrealloc function is handled not properly by coverity. There are lots of errors Allocation too small for type Hmm. Actually, I think this report from coverity kind of

Dearest Beloved

2014-07-22 Thread Mrs Susan Patrick
I am Mrs. Susan Patrick, suffering from cancerous ailment.I want you to establish my husband money (35,000,000.00 GBP) to charity home for the upkeep of widows, widowers, orphans,destitute, the down-trodden, physically challenged children. My Doctor told me recently, that I have limited days to

Re: OSX packages on git-scm.com broken on previous OSX versions?

2014-07-22 Thread Jeff King
On Mon, Jul 21, 2014 at 01:08:53PM +0100, Dan Ackroyd wrote: Apologies in advance if this is the wrong place, but it looks like the OSX packages available from http://git-scm.com/download/mac are not working for at least some people including myself. As you noticed, those packages are done by

Re: [PATCH v2 2/4] use strbuf_getcwd() to get the current working directory without fixed-sized buffers

2014-07-22 Thread Jeff King
On Mon, Jul 21, 2014 at 07:10:13PM +0200, René Scharfe wrote: Probably. And I was so glad to have found an example case for getcwd without dying and without touching the get-there-and-back cases. :) Guess I'll have to look closer at setup.c and perhaps unix-socket.c for a replacement. I

[PATCH] config.c: change the function signature of `git_config_string()`

2014-07-22 Thread Tanay Abhra
`git_config_string()` output parameter `dest` is declared as a const which is unnecessary as the caller of the function is given a strduped string which can be modified without causing any harm. Thus, remove the const from the function signature. Signed-off-by: Tanay Abhra tanay...@gmail.com ---

Re: [PATCH] config.c: change the function signature of `git_config_string()`

2014-07-22 Thread Jeff King
On Tue, Jul 22, 2014 at 03:49:56AM -0700, Tanay Abhra wrote: `git_config_string()` output parameter `dest` is declared as a const which is unnecessary as the caller of the function is given a strduped string which can be modified without causing any harm. Thus, remove the const from the

Re: [PATCH v3 6/6] notes-util.c: replace `git_config()` with `git_config_get_value()`

2014-07-22 Thread Jeff King
On Mon, Jul 21, 2014 at 04:12:25AM -0700, Tanay Abhra wrote: -static int notes_rewrite_config(const char *k, const char *v, void *cb) +static void notes_rewrite_config(struct notes_rewrite_cfg *c) { - struct notes_rewrite_cfg *c = cb; - if (starts_with(k, notes.rewrite.)

Re: [PATCH] config.c: change the function signature of `git_config_string()`

2014-07-22 Thread Tanay Abhra
On 7/22/2014 4:37 PM, Jeff King wrote: On Tue, Jul 22, 2014 at 03:49:56AM -0700, Tanay Abhra wrote: `git_config_string()` output parameter `dest` is declared as a const which is unnecessary as the caller of the function is given a strduped string which can be modified without causing any

Re: [PATCH] config.c: change the function signature of `git_config_string()`

2014-07-22 Thread Matthieu Moy
Jeff King p...@peff.net writes: will complain that we are passing a pointer to const char *, not a pointer to char *. And indeed, compiling with your patch introduces a ton of compiler warnings. Tanay: are you not compiling with gcc -Wall -Werror? (see my earlier message, just create a file

Re: [PATCH] config.c: change the function signature of `git_config_string()`

2014-07-22 Thread Tanay Abhra
On 7/22/2014 5:14 PM, Matthieu Moy wrote: Jeff King p...@peff.net writes: will complain that we are passing a pointer to const char *, not a pointer to char *. And indeed, compiling with your patch introduces a ton of compiler warnings. Tanay: are you not compiling with gcc -Wall

Re: [PATCH] config.c: change the function signature of `git_config_string()`

2014-07-22 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: OK, it seems I got convinced too quickly by Junio ;-). The function produces a char * that can be modified, but it also receives a value, and the function should keep the const to allow passing const char *. Don't blame me. I never suggested

Re: [PATCH] config.c: change the function signature of `git_config_string()`

2014-07-22 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: OK, it seems I got convinced too quickly by Junio ;-). The function produces a char * that can be modified, but it also receives a value, and the function should keep the const to allow passing const

Re: inotify support, nearly there

2014-07-22 Thread Ronnie Sahlberg
On Sun, Jul 20, 2014 at 10:10 PM, Juan P juandavid1...@gmail.com wrote: Duy Nguyen pclouds at gmail.com writes: Just a quick update for the enthusiasts. My branch file-watcher [1] has got working per-user inotify support. It's a 20 patch series so I'll refrain from spamming git at vger for a

Re: Git + mod_auth_kerb

2014-07-22 Thread Jean-Francois Bouchard
Hello, Thanks for this info. This make a lot of sense system wise. For a user point of view, it is a nightmare. Also, this break a lot of tools that are waiting username/password authentication via HTTPS. (I name Eclipse). Also, I m not able to reproduce the kerberos login on Ubuntu 14.04. I m

Re: [PATCH] config.c: change the function signature of `git_config_string()`

2014-07-22 Thread Junio C Hamano
Jeff King p...@peff.net writes: So I would not mind lifting this unnecessary restriction on git_config_string, but I do not see a way to do it without making the rest of the code much uglier (and I do not see a particular advantage in modifying git_config_string here that would make it worth

Re: Git + mod_auth_kerb

2014-07-22 Thread Junio C Hamano
brian m. carlson sand...@crustytoothpaste.net writes: So git uses libcurl with CURLAUTH_ANY. In order for authentication to work with libcurl, you have to supply a username. If you specify it in the URL, the libcurl realizes that it can use Kerberos, and goes on its merry way. If you

Re: [PATCH v10] tag: support configuring --sort via .gitconfig

2014-07-22 Thread Keller, Jacob E
On Wed, 2014-07-16 at 14:48 -0700, Jacob Keller wrote: Add support for configuring default sort ordering for git tags. Command line option will override this configured value, using the exact same syntax. Cc: Jeff King p...@peff.net Signed-off-by: Jacob Keller jacob.e.kel...@intel.com

Re: [PATCH v10] tag: support configuring --sort via .gitconfig

2014-07-22 Thread Junio C Hamano
Keller, Jacob E jacob.e.kel...@intel.com writes: Just a ping on the status of this patch? I wrote that v10 needs to be picked up in the last What's cooking, I think I did so already and pushed out the result somewhere between 'master' and 'pu'. -- To unsubscribe from this list: send the line

Re: [PATCH 02/12] wrapper.c: add a new function unlink_or_msg

2014-07-22 Thread Ronnie Sahlberg
On Fri, Jul 18, 2014 at 3:59 PM, Junio C Hamano gits...@pobox.com wrote: Hmm, the primary reason for this seems to be because you are going to handle multiple refs at a time, some of them might fail to lock due to this lowest-level helper to unlink failing, some others may fail to lock due to

Re: [PATCH 02/12] wrapper.c: add a new function unlink_or_msg

2014-07-22 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: One reason for the former could be if there are problems with multiple refs in a single transaction. It would be very annoying to have to do $ git some command error: ref foo has a problem $ run command to fix the problem $ git some sommand

Re: [PATCH 05/12] refs.c: pass NULL as *flags to read_ref_full

2014-07-22 Thread Ronnie Sahlberg
On Fri, Jul 18, 2014 at 3:31 PM, Junio C Hamano gits...@pobox.com wrote: Ronnie Sahlberg sahlb...@google.com writes: We call read_ref_full with a pointer to flags from rename_ref but since we never actually use the returned flags we can just pass NULL here instead. Sensible, at least for the

[PATCH v2 3/3] completion: complete `git push --force-with-lease=`

2014-07-22 Thread John Keeping
Signed-off-by: John Keeping j...@keeping.me.uk --- contrib/completion/git-completion.bash | 22 +- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 33a4962..293868a 100644 ---

[PATCH v2 1/3] completion: complete unstuck `git push --recurse-submodules`

2014-07-22 Thread John Keeping
Since the argument to `--recurse-submodules` is mandatory, it does not need to be stuck to the option with `=`. Signed-off-by: John Keeping j...@keeping.me.uk --- Change since v1: - Fix typo --recurse{_ = -}submodules - Dropped previous patch 1/4 adding ;; at the end of the --repo case

[PATCH v2 2/3] completion: add some missing options to `git push`

2014-07-22 Thread John Keeping
Signed-off-by: John Keeping j...@keeping.me.uk --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index bed3665..33a4962 100644 --- a/contrib/completion/git-completion.bash

[BUG] git merge-file mismerge

2014-07-22 Thread Junio C Hamano
Consider these three files: $ printf %s\n A B C D ours $ printf %s\n A C B D common $ printf %s\n A B D theirs Starting from A C B D, our side flips the order of the second (C) and the third (B), while their side removes the second (C). The correct three-way content level merge

Re: [PATCH 1/4] completion: add missing terminator in case statement

2014-07-22 Thread John Keeping
On Mon, Jul 21, 2014 at 01:09:13PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: John Keeping j...@keeping.me.uk writes: Signed-off-by: John Keeping j...@keeping.me.uk --- As these ;; are separators not terminators, this is not strictly necessary.

Re: Bug in get_pwd_cwd() in Windows?

2014-07-22 Thread René Scharfe
Am 21.07.2014 16:13, schrieb Duy Nguyen: This function tests if $PWD is the same as getcwd() using st_dev and st_ino. But on Windows these fields are always zero (mingw.c:do_lstat). If cwd is moved away, I think falling back to $PWD is wrong. I don't understand the use of $PWD in the first

Re: [PATCH 1/4] completion: add missing terminator in case statement

2014-07-22 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Mon, Jul 21, 2014 at 01:09:13PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: John Keeping j...@keeping.me.uk writes: Signed-off-by: John Keeping j...@keeping.me.uk --- As these ;; are separators not terminators,

Re: [PATCH v2 1/3] completion: complete unstuck `git push --recurse-submodules`

2014-07-22 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Since the argument to `--recurse-submodules` is mandatory, it does not need to be stuck to the option with `=`. Signed-off-by: John Keeping j...@keeping.me.uk --- Change since v1: - Fix typo --recurse{_ = -}submodules - Dropped previous

Re: [PATCH 12/12] refs.c: fix handling of badly named refs

2014-07-22 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: We currently do not handle badly named refs well : $ cp .git/refs/heads/master .git/refs/heads/master.@\*@\\. $ git branch fatal: Reference has invalid format: 'refs/heads/master.@*@\.' $ git branch -D master.@\*@\\. error: branch

.gitignore and git stash -u

2014-07-22 Thread Jeffry Johnston
We had been experiencing random deletions of files and directories, and we finally figured out what they were: git stash -u. A coworker happened upon a webpage (after losing a weeks worth of experimental work, back to his last backup), which described our problems exactly:

Re: [PATCH v2 1/3] completion: complete unstuck `git push --recurse-submodules`

2014-07-22 Thread John Keeping
On Tue, Jul 22, 2014 at 01:23:25PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Since the argument to `--recurse-submodules` is mandatory, it does not need to be stuck to the option with `=`. Signed-off-by: John Keeping j...@keeping.me.uk --- Change since v1:

Two gitweb bugs related to javascript-actions

2014-07-22 Thread Robert Luberda
Hi Some time ago I reported the two following bugs to Debian BTS, could you please look at them? 1. http://bugs.debian.org/741883 -- gitweb blame does not work correctly when $feature{'javascript-actions'} is enabled This should be one-line change fix, which I really would like to be applied

Re: [PATCH v2 1/3] completion: complete unstuck `git push --recurse-submodules`

2014-07-22 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: Makes sense. I don't think I noted the order in the $cur case, I just put the new one in here so that they were sorted lexicographically. Unless there is particular reason, consistently using lexicographic order in all related places is one good way to

Re: .gitignore and git stash -u

2014-07-22 Thread Junio C Hamano
Jeffry Johnston j...@kidsquid.com writes: We had been experiencing random deletions of files and directories, and we finally figured out what they were: git stash -u. A coworker happened upon a webpage (after losing a weeks worth of experimental work, back to his last backup), which

Re: [PATCH 12/12] refs.c: fix handling of badly named refs

2014-07-22 Thread Ronnie Sahlberg
On Tue, Jul 22, 2014 at 1:41 PM, Junio C Hamano gits...@pobox.com wrote: Ronnie Sahlberg sahlb...@google.com writes: We currently do not handle badly named refs well : $ cp .git/refs/heads/master .git/refs/heads/master.@\*@\\. $ git branch fatal: Reference has invalid format:

Re: [PATCH 12/12] refs.c: fix handling of badly named refs

2014-07-22 Thread Ronnie Sahlberg
On Tue, Jul 22, 2014 at 2:30 PM, Ronnie Sahlberg sahlb...@google.com wrote: On Tue, Jul 22, 2014 at 1:41 PM, Junio C Hamano gits...@pobox.com wrote: Ronnie Sahlberg sahlb...@google.com writes: We currently do not handle badly named refs well : $ cp .git/refs/heads/master

Re: [RFH] git clean deletes excluded files in untracked directories

2014-07-22 Thread Junio C Hamano
Jeff King p...@peff.net writes: If you have an untracked directory that contains excluded files, like this: mkdir foo echo content foo/one echo content foo/two echo foo/one .gitignore then git clean -d will notice that foo is untracked and recursively delete it and its contents,

Re: [PATCH 05/12] refs.c: pass NULL as *flags to read_ref_full

2014-07-22 Thread Ronnie Sahlberg
On Tue, Jul 22, 2014 at 11:19 AM, Ronnie Sahlberg sahlb...@google.com wrote: On Fri, Jul 18, 2014 at 3:31 PM, Junio C Hamano gits...@pobox.com wrote: Ronnie Sahlberg sahlb...@google.com writes: We call read_ref_full with a pointer to flags from rename_ref but since we never actually use the

What's cooking in git.git (Jul 2014, #04; Tue, 22)

2014-07-22 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'. We would need to start slowing down to prepare for -rc0 preview at the end of this week and then feature freeze. Some topics that joined

Re: [PATCH 12/12] refs.c: fix handling of badly named refs

2014-07-22 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: I don't think we need to do that. That would imply that we would need to be able to also allow reading the content of a badly named ref. Currently a badly named ref can not be accessed by any function except git branch -D badlynamedref which

Re: [RFH] git clean deletes excluded files in untracked directories

2014-07-22 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: If you have an untracked directory that contains excluded files, like this: mkdir foo echo content foo/one echo content foo/two echo foo/one .gitignore then git clean -d will notice that foo is untracked

Re: inotify support, nearly there

2014-07-22 Thread Duy Nguyen
On Tue, Jul 22, 2014 at 11:39 PM, Ronnie Sahlberg sahlb...@google.com wrote: Duy, keep up the good work. Once you are ready I am more than happy to help out reviewing the patches. The road I'm taking is: 1) split-index to speed up index writing time 2) add index-helper daemon to speed up index

Re: Git + mod_auth_kerb

2014-07-22 Thread brian m. carlson
On Tue, Jul 22, 2014 at 10:00:22AM -0700, Junio C Hamano wrote: brian m. carlson sand...@crustytoothpaste.net writes: So git uses libcurl with CURLAUTH_ANY. In order for authentication to work with libcurl, you have to supply a username. If you specify it in the URL, the libcurl

[PATCH v2] Documentation: fix missing text for rev-parse --verify

2014-07-22 Thread brian m. carlson
The caret (^) is used as a markup symbol in AsciiDoc. Due to the inability of AsciiDoc to parse a line containing an unmatched caret, it omitted the line from the output, resulting in the man page missing the end of a sentence. The rest of the documentation uses backticks whenever a caret is

Re: [PATCH v2] Documentation: fix missing text for rev-parse --verify

2014-07-22 Thread Jonathan Nieder
brian m. carlson wrote: Signed-off-by: brian m. carlson sand...@crustytoothpaste.net --- Documentation/git-rev-parse.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Thanks again for catching and fixing it. Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from

Re: [PATCH/RFC] git-svn: New flag to add a file in empty directories

2014-07-22 Thread Gaffney
Any idea why this parameter would slow down a clone so severely? I am experiencing clone slowdown by 5x+ after adding this parameter, which is not cool given the size of the repository and the urgency of finishing the migration. -- View this message in context:

Re: Git + mod_auth_kerb

2014-07-22 Thread brian m. carlson
On Tue, Jul 22, 2014 at 12:41:19PM -0400, Jean-Francois Bouchard wrote: Thanks for this info. This make a lot of sense system wise. For a user point of view, it is a nightmare. Also, this break a lot of tools that are waiting username/password authentication via HTTPS. (I name Eclipse). What

Fuck this piece of shit software

2014-07-22 Thread S Tan
-- 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

confused about remote branch management

2014-07-22 Thread Ross Boylan
My local master branch is the result of a merge of upstream master and some local changes. I want to merge in more recent upstream work. git pull doesn't seem to have updated origin/master, and git checkout origin/master also doesn't seem to work. Here's some info that may be relevant.

Same last name 8.15 am

2014-07-22 Thread From Hong Kong
Dear. Friend, I am Vice Chairman, Board of Directors Hang Seng Bank Hong Kong. Dr.Raymond Chien; A deceased client of mine, that shares the same last name as yours, Died without a next of kin. $16,M in my Branch. Contact Email: drhraymo...@yahoo.com.hk Regards, Dr Raymond. -- To unsubscribe from

Re: [PATCH v7 11/31] $GIT_COMMON_DIR: a new environment variable

2014-07-22 Thread Eric Sunshine
On Sun, Jul 13, 2014 at 12:50 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This variable is intended to support multiple working directories attached to a repository. Such a repository may have a main working directory, created by either git init or git clone and one or more linked