Re: Rationale behind 'extern' on protypes in .h files

2013-12-22 Thread Stefan Beller
On 22.12.2013 16:51, Ravi Shekhar Jethani wrote: Now, my real question : 1) I cannot understand the reason behind making function prototypes as extern. What purpose does this serve? AFAIK we put definition in a .c file and the prototype in a .h thats it. 2) Why are some prototypes in

Re: Verifiable git archives?

2014-01-09 Thread Stefan Beller
On 09.01.2014 04:10, Andy Lutomirski wrote: It's possible, in principle, to shove enough metadata into the output of 'git archive' to allow anyone to verify (without cloning the repo) to verify that the archive is a correct copy of a given commit. Would this be considered a useful feature?

Re: [msysGit] Consecutive git gc fails on Windows network share

2014-01-20 Thread Stefan Beller
On 20.01.2014 18:16, Torsten Bögershausen wrote: (No top-posting, please see my comments below) On 2014-01-20 15.02, Jochen wrote: On 01/16/2014 10:55 AM, Jochen Haag wrote: Hello, we want to report the following issue, because it seems to be not an intended behaviour. Maybe someone can

Re: [PATCH v2 0/2] Fix repack --window-memory=4g regression in 1.8.4

2014-01-22 Thread Stefan Beller
On 22.01.2014 20:58, Junio C Hamano wrote: The command line parser was broken when the command was reimplemented in C in two ways. It incorrectly limited the value range of window-memory and max-pack-size to int, and also stopped grokking the unit suffixes like 2g/400m/8k. These two

How to delete all merged branches?

2014-02-16 Thread Stefan Beller
Hi, so I tend to accumulate lots of branches as I'd do one branch per feature. When cleaning up, I'd like to delete all branches, which have been merged. I could use $ git branch -d (which was merged already?) ^C $ git branch --merged # let's find out ... $ #

Re: [PATCH][GSOC2014] changed logical chain in branch.c to lookup tables

2014-03-10 Thread Stefan Beller
posted earlier today. Acked-by: Stefan Beller stefanbel...@googlemail.com -- 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: Our official home page and logo for the Git project

2014-04-14 Thread Stefan Beller
So this is really bikeshedding at its finest. I'd personally do agree on the logo proposed in the first mail by Junio. However who is the core community, who am I to judge? So maybe the decision process on this issue may need a more centrally steered opinion, so why not call for votes and weight

Re: What is missing from Git v2.0

2014-04-24 Thread Stefan Beller
I don't even think we need to query the user to fill out all of the fields. We can prepopulate a lot of the fields (name, e-mail address, etc.) from OS specific defaults that are available on most systems --- specifically, the default values we would use the name and e-mail address are not

Re: What is missing from Git v2.0

2014-04-24 Thread Stefan Beller
-24 17:47 GMT+02:00 ty...@mit.edu: On Thu, Apr 24, 2014 at 05:00:13PM +0200, Stefan Beller wrote: I don't even think we need to query the user to fill out all of the fields. We can prepopulate a lot of the fields (name, e-mail address, etc.) from OS specific defaults that are available

Re: [PATCH 4/8] CodingGuidelines: give an example for control statements

2014-04-30 Thread Stefan Beller
On 30.04.2014 23:45, Junio C Hamano wrote: Signed-off-by: Junio C Hamano gits...@pobox.com --- Documentation/CodingGuidelines | 11 +++ 1 file changed, 11 insertions(+) diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 1e0c4cf..d72e912 100644 ---

Re: Big Java repositories to play with?

2014-05-07 Thread Stefan Beller
On 07.05.2014 15:23, Duy Nguyen wrote: I need some big Java repos (over 100k files) to test git status. Actually any repos with long path names and deep/wide directory structure are fine, not only Java ones. Right now I'm aware of gentoo-x86 and webkit. Let me know if you know some others. I'm

Re: Big Java repositories to play with?

2014-05-07 Thread Stefan Beller
On 07.05.2014 15:38, Stefan Beller wrote: On 07.05.2014 15:23, Duy Nguyen wrote: I need some big Java repos (over 100k files) to test git status. Actually any repos with long path names and deep/wide directory structure are fine, not only Java ones. Right now I'm aware of gentoo-x86

Re: Big Java repositories to play with?

2014-05-07 Thread Stefan Beller
On 07.05.2014 16:01, Ævar Arnfjörð Bjarmason wrote: On Wed, May 7, 2014 at 3:23 PM, Duy Nguyen pclo...@gmail.com wrote: I need some big Java repos (over 100k files) to test git status. Actually any repos with long path names and deep/wide directory structure are fine, not only Java ones. Right

Re: [PATCH v1 25/25] contrib: remove 'mw-to-git'

2014-05-09 Thread Stefan Beller
On 09.05.2014 12:59, Felipe Contreras wrote: Matthieu Moy wrote: Felipe Contreras felipe.contre...@gmail.com writes: No chance of ever graduating. I see no relationship between the chance of graduating and the removal from contrib/. Read contrib/README. If you want to remove mw-to-git

Re: [PATCH v1 00/25] contrib: cleanup

2014-05-09 Thread Stefan Beller
For discussing these larger changes in the first version you may want to use the -D option of git format-patch? 2014-05-09 4:01 GMT+02:00 Felipe Contreras felipe.contre...@gmail.com: Martin Langhoff wrote: On Thu, May 8, 2014 at 8:58 PM, Felipe Contreras felipe.contre...@gmail.com wrote:

Re: [PATCH v1 19/25] contrib: remove 'diff-highlight'

2014-05-09 Thread Stefan Beller
It is serious. The purpose of the 'contrib/' area is not clear. The statemens coming from Junio don't match what is on 'contrib/README'. So we have a huge variance of quality all over 'contrib/'. Some tools in contrib have higher quality than what is part of the core (e.g. they have tests,

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

2014-05-12 Thread Stefan Beller
2014-05-12 10:12 GMT+02:00 Felipe Contreras felipe.contre...@gmail.com: Felipe Contreras wrote: Linus Torvalds wrote: Felipe, stop this stupid blaming of everybody but yourself. Show me evidence that this decision was my fault. Junio certainly hasn't said so. You just have no idea what we

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

2014-05-12 Thread Stefan Beller
2014-05-12 15:45 GMT+02:00 Paolo Ciarrocchi paolo.ciarroc...@gmail.com: No, sorry but I'm NOT interested in lying to git community. It's not lying. See the Helped-By: lines in git.git commits. Often the help was formulating a correct and easy-to-understand commit message. -- To unsubscribe

Re: [PATCH 0/8] Speed up cache loading time

2014-05-13 Thread Stefan Beller
That is clocked at 800 MHz. A repository at this size deserves a better CPU. At 2.5 GHz we spend 183.228ms on loading the index. A reasonable number to me. If we scale other parts of git-status as well as this, we should be able to make git status within 1 or 2 seconds. Which harddrive do

[PATCH] various contrib: Fix links in man pages

2014-08-07 Thread Stefan Beller
Inspired by 2147fa7e (2014-07-31 git-push: fix link in man page), I grepped through the whole tree searching for 'gitlink:' occurrences. Signed-off-by: Stefan Beller stefanbel...@gmail.com --- contrib/convert-objects/git-convert-objects.txt | 2 +- contrib/examples/git-svnimport.txt

[PATCH 2/2] clone.c: don't leak memory in cmd_clone

2014-08-10 Thread Stefan Beller
Free the refspec. Found by scan.coverity.com (Id: 1127806) Signed-off-by: Stefan Beller stefanbel...@gmail.com --- builtin/clone.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/clone.c b/builtin/clone.c index bbd169c..dd4092b 100644 --- a/builtin/clone.c +++ b/builtin/clone.c

[PATCH 1/2] remote.c: don't leak the base branch name in format_tracking_info

2014-08-10 Thread Stefan Beller
Found by scan.coverity.com (Id: 1127809) Signed-off-by: Stefan Beller stefanbel...@gmail.com --- remote.c | 1 + 1 file changed, 1 insertion(+) diff --git a/remote.c b/remote.c index 3d6c86a..2c1458f 100644 --- a/remote.c +++ b/remote.c @@ -1983,6 +1983,7 @@ int format_tracking_info(struct

Re: [PATCH 1/2] remote.c: don't leak the base branch name in format_tracking_info

2014-08-10 Thread Stefan Beller
On 10.08.2014 15:57, Stefan Beller wrote: Found by scan.coverity.com (Id: 1127809) Signed-off-by: Stefan Beller stefanbel...@gmail.com --- remote.c | 1 + 1 file changed, 1 insertion(+) diff --git a/remote.c b/remote.c index 3d6c86a..2c1458f 100644 --- a/remote.c +++ b/remote.c

Re: Unify subcommand structure; introduce double dashes for all subcommands?

2014-08-10 Thread Stefan Beller
On 23.07.2014 19:52, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: A git command is generally setup as: git command [subcommand] [options] ... The subcommands vary wildly by the nature of the command. However all subcommands could at least follow one style

[PATCH] remote.c: don't leak the base branch name in format_tracking_info

2014-08-10 Thread Stefan Beller
Found by scan.coverity.com (Id: 1127809) Signed-off-by: Stefan Beller stefanbel...@gmail.com --- remote.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/remote.c b/remote.c index 3d6c86a..894db09 100644 --- a/remote.c +++ b/remote.c @@ -1920,7 +1920,7 @@ int

Re: Unify subcommand structure; introduce double dashes for all subcommands?

2014-08-10 Thread Stefan Beller
On 10.08.2014 20:13, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: On 23.07.2014 19:52, Junio C Hamano wrote: Sounds familiar. E.g. here is a similar thread about a year ago. http://thread.gmane.org/gmane.comp.version-control.git/231376/focus=231478 Further

[PATCH 1/2] blame.c: Add translation to warning about failed revision walk

2014-08-10 Thread Stefan Beller
blame belonging to the group of ancillaryinterrogators and not to plumbinginterrogators should have localized error messages? Signed-off-by: Stefan Beller stefanbel...@gmail.com --- builtin/blame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/blame.c b/builtin

[PATCH 2/2] prepare_revision_walk: Check for return value in all places

2014-08-10 Thread Stefan Beller
messages, when there were none. Signed-off-by: Stefan Beller stefanbel...@gmail.com --- builtin/branch.c | 4 +++- builtin/commit.c | 3 ++- remote.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0591b22..ced422b 100644

Re: How to give permission to another user on my git remote

2014-08-11 Thread Stefan Beller
On 11.08.2014 13:41, Jagan Teki wrote: Hi, I have created one repository (but I'm not a root user on the server) like $ git init --bare And I do push my changes locally to remote repo where I created. My friend also working the same repo, and he needs to push the changes on the same.

Re: [PATCH 2/2] prepare_revision_walk: Check for return value in all places

2014-08-11 Thread Stefan Beller
On 11.08.2014 21:09, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: Even the documentation tells us: You should check if it returns any error (non-zero return code) and if it does not, you can start using get_revision() to do the iteration

[PATCH] unpack-tree.c: remove dead code

2014-08-11 Thread Stefan Beller
This issue was found by coverity, Id:290002 Signed-off-by: Stefan Beller stefanbel...@gmail.com --- unpack-trees.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index c6aa8fb..e6d37ff 100644 --- a/unpack-trees.c +++ b/unpack-trees.c

[PATCH] mailsplit.c: remove dead code

2014-08-11 Thread Stefan Beller
This was found by coverity. (Id: 290001) the variable 'output' is only assigned to a value inequal to NUL, after all gotos to the corrupt label. Therefore we can conclude the two removed lines are actually dead code. Signed-off-by: Stefan Beller stefanbel...@gmail.com --- builtin/mailsplit.c

[PATCH] unpack-tree.c: remove dead code

2014-08-12 Thread Stefan Beller
. The inner condition on the current tree was introduced in ee6566e8d70da682ac4926d, Sept. 2005, [PATCH] Rewrite read-tree This issue was found by coverity, Id:290002 Signed-off-by: Stefan Beller stefanbel...@gmail.com Helped-by: Junio C Hamano gits...@pobox.com --- unpack-trees.c | 12 1

[PATCH] mailsplit.c: remove dead code

2014-08-12 Thread Stefan Beller
This was found by coverity. (Id: 290001) The variable 'output' is assigned to a value after all gotos to the corrupt label. Remove the goto by moving the errorhandling code to the condition, which detects the error. Signed-off-by: Stefan Beller stefanbel...@gmail.com Helped-by: René Scharfe l

Re: [PATCH 0/3] Re: [PATCH] unpack-tree.c: remove dead code

2014-08-13 Thread Stefan Beller
On 13.08.2014 01:57, Jonathan Nieder wrote: Stefan Beller wrote: In line 1763 of unpack-tree.c we have a condition on the current tree [...] The description is describing why the patch is *correct* (i.e., not going to introduce a bug), while what the reader wants to know is why

Re: [PATCH 00/18] Signed push

2014-08-22 Thread Stefan Beller
On 20.08.2014 00:06, Junio C Hamano wrote: While signed tags and commits assert that the objects thusly signed came from you, who signed these objects, there is not a good way to assert that you wanted to have a particular object at the tip of a particular branch. My signing v2.0.1 tag only

Re: [PATCH 00/18] Signed push

2014-08-22 Thread Stefan Beller
On 22.08.2014 22:03, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: So there would be tags like: master_2014_08_21 master_2014_08_22 ... maint_2014_08_13 maint_2014_08_21 and so on. Whenever there is no tag at the tip of the branch, we'd know

Re: [PATCH 00/18] Signed push

2014-08-22 Thread Stefan Beller
On 22.08.2014 22:33, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: On 22.08.2014 22:03, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: So there would be tags like: master_2014_08_21 master_2014_08_22 ... maint_2014_08_13

Re: [PATCH 00/18] Signed push

2014-08-22 Thread Stefan Beller
On 23.08.2014 00:32, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: On 22.08.2014 22:33, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: On 22.08.2014 22:03, Junio C Hamano wrote: Stefan Beller stefanbel...@gmail.com writes: So there would be tags

Re: [PATCH] bisect: save heap memory. allocate only the required amount

2014-08-24 Thread Stefan Beller
On 24.08.2014 16:17, Arjun Sreedharan wrote: Find and allocate the required amount instead of allocating extra 100 bytes Signed-off-by: Arjun Sreedharan arjun...@gmail.com --- bisect.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bisect.c b/bisect.c index

Re: [RFC] improving advice message from git commit during a merge

2014-08-28 Thread Stefan Beller
On 27.08.2014 20:23, Junio C Hamano wrote: I am not doing this myself soon, though. Hint, hint... I asked once upon a time, if there was a place, which collects such topics for casual contributors and new comers. Would you mind to update the leftover bits at

Auto Packing message twice?

2014-08-30 Thread Stefan Beller
Hi, so I fetched from a repository today and I got the message twice: Auto packing the repository in background for optimum performance. See git help gc for manual housekeeping. I'm running git version 2.1.0.rc2 Full output: $ git fetch --all --prune Fetching origin Fetching mainline

Re: [PATCH v2 19/19] signed push: fortify against replay attacks

2014-08-30 Thread Stefan Beller
On 22.08.2014 22:30, Junio C Hamano wrote: @@ -1226,12 +1232,28 @@ static int delete_only(struct command *commands) return 1; } +static char *prepare_push_cert_nonce(const char *sitename, const char *dir) +{ + struct strbuf buf = STRBUF_INIT; + unsigned char sha1[20]; +

Re: mini-GitTogether Oct 2014? (was: Next Git conference or meeting)

2014-09-03 Thread Stefan Beller
On 03.09.2014 23:09, Jeff King wrote: Reply-To: In-Reply-To: CAP8UFD1Jzy2jzRaFh35=y1ycjcmhkskxbsxp1subl2r2bqa...@mail.gmail.com On Tue, Sep 02, 2014 at 08:21:37AM +0200, Christian Couder wrote: It looks like there will be no Git conference or Git developer meeting this year. I know

Re: [PATCH v2] use a hashmap to make remotes faster

2014-09-05 Thread Stefan Beller
On 29.07.2014 16:43, Patrick Reynolds wrote: Remotes are stored as an array, so looking one up or adding one without duplication is an O(n) operation. Reading an entire config file full of remotes is O(n^2) in the number of remotes. For a repository with tens of thousands of remotes, the

Re: [PATCH] repack: call prune_packed_objects() and update_server_info() directly

2014-09-13 Thread Stefan Beller
script and making it look more like a C program. Reviewed-by: Stefan Beller stefanbel...@gmail.com --- builtin/repack.c | 23 ++- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/builtin/repack.c b/builtin/repack.c index fc088db..2aae05d 100644 --- a/builtin

[PATCH] help: Fix size passed to qsort

2014-09-17 Thread Stefan Beller
We actually want to have the size of one 'name' and not the size of the names array. Signed-off-by: Stefan Beller stefanbel...@gmail.com --- help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help.c b/help.c index 7af65e2..2072a87 100644 --- a/help.c +++ b/help.c

[PATCH] t9300-fast-import: fix typo in test description

2014-09-21 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@gmail.com --- t/t9300-fast-import.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 8a05449..8df0445 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -2866,7

[PATCH] t6031-test-merge-recursive: Forgot to add file to be committed

2014-09-21 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@gmail.com --- t/t6031-merge-recursive.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh index a953f1b..6464a16 100755 --- a/t/t6031-merge-recursive.sh +++ b/t/t6031-merge-recursive.sh @@ -13,6

[PATCH] merge-recursive: Fix copy-paste mistake

2014-09-21 Thread Stefan Beller
of time. Signed-off-by: Stefan Beller stefanbel...@gmail.com --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 22315c3..d63524c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1555,7 +1555,7 @@ static int

Re: How to compile Git with NDK?

2014-09-22 Thread Stefan Beller
On 22.09.2014 21:04, Robert Dailey wrote: I run the following on Ubuntu: fe@BLD01:~/code/git$ autoconf fe@BLD01:~/code/git$ ./configure --prefix=/home/fe/git-arm --build=x86_64-linux-gnu --host=arm-linux-androideabi configure: Setting lib to 'lib' (the default) configure: Will try -pthread

[PATCH] de.po: Fixup one translation

2014-09-23 Thread Stefan Beller
English grammar with German words doesn't make it a German translation. ;) We also need to fix the Signed-off-by: Stefan Beller stefanbel...@gmail.com --- po/de.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index e5d2b25..bae3723 100644

Re: [PATCH] de.po: Fixup one translation

2014-09-23 Thread Stefan Beller
On 23.09.2014 10:06, Eric Sunshine wrote: On Tue, Sep 23, 2014 at 3:37 AM, Stefan Beller stefanbel...@gmail.com wrote: English grammar with German words doesn't make it a German translation. ;) We also need to fix the Sentence fragment. Yeah, originally I intended to just fix the singular

[PATCH] de.po: Fixup one translation

2014-09-23 Thread Stefan Beller
English grammar with German words doesn't make it a German translation. ;) Signed-off-by: Stefan Beller stefanbel...@gmail.com --- Here we go again without sentence fragments. Thanks, Stefan po/de.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po

[PATCH] merge-recursive: Remove miss leading comment

2014-09-23 Thread Stefan Beller
Commented code, which doesn't even compile, is of no use any more? Signed-off-by: Stefan Beller stefanbel...@gmail.com --- To be applied on top of sb/merge-recursive-copy-paste-fix merge-recursive.c | 4 1 file changed, 4 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c

Re: Fix a critical bug in git-cvsexportcommit.perl

2014-09-24 Thread Stefan Beller
On 24.09.2014 10:32, Luke Lee wrote: I fixed a long standing bug in git-cvsexportcommit.perl script which corrupt my Perl code several times. This time I figure it out. It's about keyword expansion. Take a simple example, a Perl code like this: printf Perl/Tk $Tk::Version

Re: [PATCH] merge-recursive: Fix copy-paste mistake

2014-09-24 Thread Stefan Beller
On 21.09.2014 22:49, Stefan Beller wrote: I'd be happy to have a test for this bug(?) attached to t6031-merge-recursive.sh, but I did not manage to come up with a test in a reasonable amount of time. So I am just sending out my progress on the testing for this as I may be short on time within

[PATCH 1/2] transport: Free leaking head in transport_print_push_status

2014-10-20 Thread Stefan Beller
From: Stefan Beller sbel...@google.com Found by scan.coverity.com (ID: 1248110) Signed-off-by: Stefan Beller sbel...@google.com --- transport.c | 1 + 1 file changed, 1 insertion(+) diff --git a/transport.c b/transport.c index 055d2a2..fbab6ee 100644 --- a/transport.c +++ b/transport.c

[PATCH 2/2] .mailmap: Add Stefan Bellers corporate mail address

2014-10-20 Thread Stefan Beller
From: Stefan Beller sbel...@google.com Note that despite the private address being first, Google owns the copyright on this patch as any other patch I'll be sending signed off by the sbel...@google.com address. Signed-off-by: Stefan Beller sbel...@google.com --- .mailmap | 1 + 1 file changed

Re: [PATCH v2 2/7] send-pack.c: add an --atomic-push command line argument

2014-11-04 Thread Stefan Beller
On Mon, Nov 3, 2014 at 11:12 AM, Ronnie Sahlberg sahlb...@google.com wrote: This adds support to send-pack to to negotiate and use atomic pushes /s/to to/to/ iff the server supports it. Atomic pushes are activated by a new command line flag --atomic-push. In order to do this we also need to

Re: [PATCH 0/6] Corrections to the mailmap file

2013-07-11 Thread Stefan Beller
On 07/11/2013 07:33 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: I noticed many duplicates in email addresses but having the same name by running: # Finding out duplicates by comparing names: git shortlog -sne |awk '{ NF--; $1=; print }' |sort |uniq -d

[PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
=; print }' |sort |uniq -d --- Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- .mailmap | 95 1 file changed, 71 insertions(+), 24 deletions(-) diff --git a/.mailmap b/.mailmap index 345cce6..1179767 100644 --- a/.mailmap

[PATCH v2] Corrections to the mailmap file

2013-07-12 Thread Stefan Beller
is reduced. The 6 patches sent at 4th July are not required anymore, but the following patch directly applies to your master branch. Stefan Beller (1): .mailmap: Map email addresses to names .mailmap | 95 1 file changed, 71

Bug in .mailmap handling?

2013-07-12 Thread Stefan Beller
Hello, you may have noticed I am currently trying to bring the mailmap file of git itself up to date. I noticed some behavior, which I did not expect. Have a look yourself: --- # prepare test environment: mkdir testmailmap cd testmailmap/ git init # do a

[PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
here http://marc.info/?l=gitm=137364524514927w=2 http://www.mail-archive.com/git@vger.kernel.org/msg31964.html (Bug in .mailmap handling?, for example look for Knut Franke) Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- .mailmap | 28 ++-- 1 file changed, 26

Re: Bug in .mailmap handling?

2013-07-12 Thread Stefan Beller
latest patch for the mailmap to reproduce on real names, please. On 07/12/2013 07:35 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: Hello, you may have noticed I am currently trying to bring the mailmap file of git itself up to date. I noticed some behavior, which

Re: [PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
Which tool would you recommend to sort stuff? Or rather the exact parameters for /usr/bin/sort ? Thanks, Stefan On 07/12/2013 08:57 PM, Jonathan Nieder wrote: Stefan Beller wrote: --- a/.mailmap +++ b/.mailmap @@ -5,99 +5,146 @@ [...] Chris Shoemaker c.shoema...@cox.net -Dan Johnson

Re: [PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
From the man page *** WARNING *** The locale specified by the environment affects sort order. Set LC_ALL=C to get the traditional sort order that uses native byte values. And indeed I can avoid being nitpicked again for wrong sorting. ;) On 07/12/2013 09:02 PM, Stefan Beller wrote

[PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
Ok I am sending all confirmed changes now again in one big patch, as the sorting was wrong. Stefan Beller (1): .mailmap: Map email addresses to names .mailmap | 135 +++ 1 file changed, 110 insertions(+), 25 deletions

[PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
duplicates by comparing names: git shortlog -sne |awk '{ NF--; $1=; print }' |sort |uniq -d - Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- .mailmap | 135 +++ 1 file changed, 110 insertions(+), 25 deletions(-) diff

Re: Bug in .mailmap handling?

2013-07-12 Thread Stefan Beller
On 07/12/2013 10:28 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: # Adding the line to the mailmap should make life easy, so we know # it's the same person echo A a...@example.org changed_em...@example.org .mailmap While I was looking

[PATCH] Add a testcase for checking case insensitivity of mail map

2013-07-12 Thread Stefan Beller
Your patch seems to do it. I added a test case which doesn't fail, if your patch is added. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- t/t4203-mailmap.sh | 33 + 1 file changed, 33 insertions(+) diff --git a/t/t4203-mailmap.sh b/t/t4203

Re: [PATCH] t4203: fix checks for email address remapping

2013-07-13 Thread Stefan Beller
On 07/13/2013 02:35 AM, Eric Sunshine wrote: Two tests in t4203-mailmap.sh set up the mapping b...@company.xx = b...@company.xy in an apparent attempt to check that email address remapping works as expected (in addition to name remapping which is also tested). To test the remapping,

[PATCH] mailmap: Testing the single letter name case.

2013-07-13 Thread Stefan Beller
This is a regression test for a66e77eab70a08938fdc2227b7ada0f0465c6991 Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- t/t4203-mailmap.sh | 41 + 1 file changed, 41 insertions(+) diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh index

Re: [PATCH] mailmap: Testing the single letter name case.

2013-07-13 Thread Stefan Beller
On 07/13/2013 07:38 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: This is a regression test for a66e77eab70a08938fdc2227b7ada0f0465c6991 Sorry, I do not quite get this. If you apply the patch on top of the said commit before that commit, the new test does

[PATCH] .mailmap: Combine more (email, name) to individual persons

2013-07-14 Thread Stefan Beller
I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. It's mostly email mappings again. However we also have Nick Stokoe, who contributed as Nick Woolley. He changed his name, but kept the email. Signed-off-by: Stefan

[PATCH] more mailmap entries

2013-07-14 Thread Stefan Beller
This patch goes on top of branch sb/mailmap-updates Stefan Beller (1): .mailmap: Combine more (email, name) to individual persons .mailmap | 42 +++--- 1 file changed, 35 insertions(+), 7 deletions(-) -- 1.8.3.2.804.g0da7a53.dirty -- To unsubscribe from

[PATCH] commit: Fix a memory leak in determine_author_info

2013-07-14 Thread Stefan Beller
The date variable is assigned new memory via xmemdupz and 2 lines later it is assigned new memory again via xmalloc, but the first assignment is never freed nor used. --- builtin/commit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index 790e5ab..00da83c

[PATCH 1/4] daemon.c:handle: Remove unneeded check for null pointer.

2013-07-14 Thread Stefan Beller
addr doesn't need to be checked at that line as it it already accessed 7 lines before in the if (addr-sa_family). Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- daemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon.c b/daemon.c index 6aeddcb..5e48c1e

[PATCH 3/4] diff-no-index: Remove unused variable.

2013-07-14 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- diff-no-index.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/diff-no-index.c b/diff-no-index.c index e66fdf3..842add4 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -181,19 +181,18 @@ static int

[PATCH 2/4] commit: Fix a memory leak in determine_author_info

2013-07-14 Thread Stefan Beller
The date variable is assigned new memory via xmemdupz and 2 lines later it is assigned new memory again via xmalloc, but the first assignment is never freed nor used. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/commit.c | 1 - 1 file changed, 1 deletion(-) diff --git

[PATCH 4/4] diff.c: Do not initialize a variable, which gets reassigned anyway.

2013-07-14 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- diff.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/diff.c b/diff.c index e53ddad..24382d7 100644 --- a/diff.c +++ b/diff.c @@ -1677,21 +1677,19 @@ static void show_stats(struct diffstat_t *data, struct

Re: [PATCH] .mailmap: Combine more (email, name) to individual persons

2013-07-15 Thread Stefan Beller
On 07/15/2013 08:10 AM, Jonathan Nieder wrote: Stefan Beller wrote: Signed-off-by: Stefan Beller stefanbel...@googlemail.com Markup and methodology look correct. Fwiw, Reviewed-by: Jonathan Nieder jrnie...@gmail.com Is this meant to be squashed with 94b410bb (.mailmap: Map email

Bug in git show?

2013-07-15 Thread Stefan Beller
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello, so I wanted to write a script using some git commands, but the output of the git commands is not as expected. I am using git --version git version 1.8.3.2.804.g0da7a53 (current origin/master at git://github.com/gitster/git.git) The command I

Re: Bug in git show?

2013-07-15 Thread Stefan Beller
On 07/15/2013 02:12 PM, Matthieu Moy wrote: Stefan Beller stefanbel...@googlemail.com writes: However I sometimes also get: sb@sb:~/OSS/git$ git show --format=%ad 0da7a53 Fri Jul 12 10:49:34 2013 -0700 diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.txt index

Re: [PATCH] commit: Fix a memory leak in determine_author_info

2013-07-15 Thread Stefan Beller
On 07/15/2013 04:42 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: The date variable is assigned new memory via xmemdupz and 2 lines later it is assigned new memory again via xmalloc, but the first assignment is never freed nor used. --- builtin/commit.c | 1

[PATCH 0/2] git diff -q option removal

2013-07-16 Thread Stefan Beller
: touch actual_file git diff -q actual_file no_file fatal: invalid diff option/value: -q echo $? 128 Thanks, Stefan Stefan Beller (2): diff --no-index: remove nonfunctional -q handling git diff: Remove -q option to stay silent on missing files

[PATCH 1/2] diff --no-index: remove nonfunctional -q handling

2013-07-16 Thread Stefan Beller
that it is now a no-op, continuing to accept and ignore the -q option in git diff --no-index to avoid breaking scripts. Signed-off-by: Stefan Beller stefanbel...@googlemail.com Helped-by: Jonathan Nieder jrnie...@gmail.com --- diff-no-index.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff

[PATCH 2/2] diff: Remove -q to stay silent on missing files.

2013-07-16 Thread Stefan Beller
was quoted for its exit code behavior regarding files being found or not. Signed-off-by: Stefan Beller stefanbel...@googlemail.com Proposed-by: Jonathan Nieder jrnie...@gmail.com --- Documentation/git-diff-files.txt | 6 +- diff-no-index.c | 2 -- 2 files changed, 1 insertion

Re: [PATCH v4 0/6] Make git show -s easier to discover for users

2013-07-16 Thread Stefan Beller
On 07/16/2013 07:46 PM, Jonathan Nieder wrote: Matthieu Moy wrote: Matthieu Moy (6): t4000-diff-format.sh: modernize style diff: allow --no-patch as synonym for -s diff: allow --patch cie to override -s/--no-patch Documentation/git-show.txt: include common diff options, like

Re: [PATCH] Fix some sparse warnings

2013-07-16 Thread Stefan Beller
On 07/16/2013 10:53 PM, Philip Oakley wrote: From: Jeff King p...@peff.net Sent: Tuesday, July 16, 2013 7:21 AM On Tue, Jul 16, 2013 at 07:57:20AM +0200, Johannes Sixt wrote: Am 7/15/2013 19:31, schrieb Ramsay Jones: Sparse issues three Using plain integer as NULL pointer warnings. Each

Re: [PATCH 0/2] git diff -q option removal

2013-07-17 Thread Stefan Beller
On 07/17/2013 07:04 PM, Junio C Hamano wrote: Builtins link all sorts of stuff from outside, e.g. diff.c and diffcore-*.c at the toplevel. I do not see diff_no_index.c is any different, so I am probably not understanding your question. Thanks for the explanation. I am not yet very used to

[PATCH] .mailmap: Combine more (email, name) to individual persons

2013-07-17 Thread Stefan Beller
I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- .mailmap | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.mailmap b

Re: [PATCH] Fix some sparse warnings

2013-07-17 Thread Stefan Beller
On 07/16/2013 10:53 PM, Philip Oakley wrote: Does anyone run the new static checker called 'Stack' that precisely identifies unstable code? [though the paper's conclusion says 'All Stack source code will be publicly available.' which suggests it's not yet available] So I started using the

[PATCH] parse_object_buffer: Correct freeing the buffer.

2013-07-17 Thread Stefan Beller
sure, the buffer freeing condition is deterministic. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- object.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/object.c b/object.c index cbc7333..d8a4b1f 100644 --- a/object.c +++ b/object.c @@ -145,7 +145,7

Re: [PATCH] Fix some sparse warnings

2013-07-17 Thread Stefan Beller
On 07/18/2013 12:08 AM, Stefan Beller wrote: So I started using the clang code analyzer on git. One of the first warnings actually is this: So in case somebody else would also like to play around with the clang static code analyzer: # get clang: cd good location git clone http://llvm.org

[PATCH 3/3] apply, find_name_traditional: Do not initialize len to the lines length.

2013-07-18 Thread Stefan Beller
The variable len is set to len = strchrnul(line, '\n') - line; unconditionally 9 lines later, hence we can remove the call to strlen. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b

[PATCH 2/3] http-push.c, add_send_request: Do not initialize transfer_request.

2013-07-18 Thread Stefan Beller
maybe I need a feature to send a patch without a symmetric number of lines around change-diff. For this patch I'd be only interested in showing the next 20 lines, but nothing really before the function declaration. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- http-push.c | 2 +- 1

[PATCH 1/3] treewalk.c: Rename variable ret to cb_bits and remove some dead lines.

2013-07-18 Thread Stefan Beller
was removed at the start of the function as well after the if(interesting) block. Those were unneeded as that variable is set to the callback return value any time we enter the if(interesting) block, so we'd overwrite old values anyway. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- tree

[PATCH] status_printf_ln: Suppress false positive warnings of empty format string.

2013-07-19 Thread Stefan Beller
slightly harder to read. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/commit.c | 2 +- wt-status.c | 18 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 65cf2a7..34bc274 100644 --- a/builtin

  1   2   3   4   5   6   7   8   9   10   >