Re: [PATCH 2/2] commit-slab: declare functions static inline

2013-12-01 Thread Duy Nguyen
Thomas, As you're touching this, perhaps you coud fix this line in slabname_at() too? s-slab = xrealloc(s-slab, (nth_slab + 1) * sizeof(s-slab)); I think it should be sizeof(*s-slab), not sizeof(s-slab), even though the end result is the same. -- Duy -- To unsubscribe from this list: send the

Re: Git merge: conflict is expected, but not detected

2013-12-01 Thread Evgeniy Ivanov
Jon, Kyle, Brian, Thanks a lot for your answers! On Sat, Nov 30, 2013 at 12:51 PM, Jon Seymour jon.seym...@gmail.com wrote: From the perspective of topic there had been no change to the definition of bar(), hence there was no change to contribute to the eventual merge with master. One way

Re: git stash doesn't honor --work-tree or GIT_WORK_TREE

2013-12-01 Thread Thomas Rast
Øystein Walle oys...@gmail.com writes: Aaron Brooks aaron at brooks1.net writes: Unlike other commands, git stash doesn't work outside of the worktree, even when --work-tree is specified: [...] The environment variables are properly exported. I verified this by adding 'echo $GIT_WORK_TREE;

Re: git stash doesn't honor --work-tree or GIT_WORK_TREE

2013-12-01 Thread Duy Nguyen
On Sun, Dec 1, 2013 at 6:12 PM, Thomas Rast t...@thomasrast.ch wrote: Øystein Walle oys...@gmail.com writes: The problem seems to be that git rev-parse --is-inside-work-tree does not honor these. In fact it doesn't even honor --git-dir or --work-tree. Judging by the name this may be

[no subject]

2013-12-01 Thread BSL
Company Representative Needed. Reply For Details. -- 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/WIP] Repair DF conflicts during fetch.

2013-12-01 Thread Thomas Miller
On Fri, Nov 29, 2013 at 1:07 PM, Thomas Rast t...@thomasrast.ch wrote: Tom Miller jacker...@gmail.com writes: When a DF conflict occurs during a fetch, --prune should be able to fix it. When fetching with --prune, the fetching process happens before pruning causing the DF conflict to persist

Re: git stash doesn't honor --work-tree or GIT_WORK_TREE

2013-12-01 Thread Thomas Rast
Duy Nguyen pclo...@gmail.com writes: On Sun, Dec 1, 2013 at 6:12 PM, Thomas Rast t...@thomasrast.ch wrote: Øystein Walle oys...@gmail.com writes: The problem seems to be that git rev-parse --is-inside-work-tree does not honor these. In fact it doesn't even honor --git-dir or --work-tree.

Re: GIT_DIR not auto ignored

2013-12-01 Thread Dennis Kaarsemaker
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 # On branch master # # Initial commit # # Untracked files: # .foo/ nothing added

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 # On

[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: git stash doesn't honor --work-tree or GIT_WORK_TREE

2013-12-01 Thread Øystein Walle
Duy Nguyen pclouds at gmail.com writes: It should. At the beginning of cmd_rev_parse(), setup_git_directory() is called, which will check and follow all GIT_* or their command line equivalent. I'll look into this some time later. I think I was wrong and rev-parse --is-inside-work-tree *does*

Hi

2013-12-01 Thread Dr Nancy duke
Вы выиграли £ 1.000.000.00 в Великобритании Лото Mailto: nancy-lamb...@hotmail.co.uk N�r��yb�X��ǧv�^�)޺{.n�+ا���ܨ}���Ơz�j:+v���zZ+��+zf���h���~i���z��w���?��)ߢf

[PATCH] commit-slab: sizeof() the right type in xrealloc

2013-12-01 Thread Thomas Rast
When allocating the slab, the code accidentally computed the array size from s-slab (an elemtype**). The slab is an array of elemtype*, however, so we should take the size of *s-slab. Noticed-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Thomas Rast t...@thomasrast.ch --- [I hope

Re: [PATCH v3 gitk 0/5] gitk -L

2013-12-01 Thread Paul Mackerras
On Sat, Nov 16, 2013 at 06:37:39PM +0100, Thomas Rast wrote: These patches implement 'gitk -L'. They are exactly the same as the gitk patches from v2 at http://thread.gmane.org/gmane.comp.version-control.git/227151/focus=236903 except that they apply to the gitk-git tree at

Re: [PATCH v2] gitk: make pointer selection visible in highlighted lines

2013-12-01 Thread Paul Mackerras
On Thu, Nov 28, 2013 at 11:20:18PM +0200, Max Kirillov wrote: Custom tags have higher priority than `sel`, and when they define their own background, it makes selection invisible. Especially inconvenient for `filesep` (to select filenames), but also affects other tags. Use `tag raise` to fix

[PATCH 2/3] send-email: --smtp-ssl-cert-path takes an argument

2013-12-01 Thread Thomas Rast
35035bb (send-email: be explicit with SSL certificate verification, 2013-07-18) forgot to specify that --smtp-ssl-cert-path takes a string argument. This means that the option could not actually be used as intended. Presumably noone noticed because it's much easier to set it through configs

[PATCH 1/3] send-email: pass Debug to Net::SMTP::SSL::new

2013-12-01 Thread Thomas Rast
We forgot to pass the Debug option through to Net::SMTP::SSL-new -- which is the same as Net::SMTP-new. This meant that with security set to SSL, we would never enable debug output. Pass through the flag. Signed-off-by: Thomas Rast t...@thomasrast.ch --- git-send-email.perl | 1 + 1 file

[PATCH 3/3] send-email: set SSL options through IO::Socket::SSL::set_client_defaults

2013-12-01 Thread Thomas Rast
When --smtp-encryption=ssl, we use a Net::SMTP::SSL connection, passing its -new all the options that would otherwise go to Net::SMTP-new (most options) and IO::Socket::SSL-start_SSL (for the SSL options). However, while Net::SMTP::SSL replaces the underlying socket class with an SSL socket, it

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

2013-12-01 Thread Duy Nguyen
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 it by setting $GIT_DIR Reported-By: Ingy döt Net i...@ingy.net Signed-off-by: Dennis Kaarsemaker

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

2013-12-01 Thread Thomas Rast
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 it by setting $GIT_DIR [...] + if (simplify_away(path-buf,

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 it by

Re: [PATCH v3] gitweb: Add an option for adding more branch refs

2013-12-01 Thread Jakub Narębski
On Thu, Nov 28, 2013 at 12:44 PM, Krzesimir Nowak krzesi...@endocode.com wrote: Allow @additional_branch_refs configuration variable to tell gitweb to show refs from additional hierarchies in addition to branches in the list-of-branches view. Signed-off-by: Krzesimir Nowak

Re: [PATCH v3] gettext.c: detect the vsnprintf bug at runtime

2013-12-01 Thread Trần Ngọc Quân
On 01/12/2013 09:45, Nguyễn Thái Ngọc Duy wrote: Bug 6530 [1] in glibc causes git show v0.99.6~1 to fail with error your vsnprintf is broken. The workaround avoids that, but it corrupts system error messages in non-C locales. The bug has been fixed since 2.17. We could know running glibc

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

2013-12-01 Thread Eric Sunshine
On Sun, Dec 1, 2013 at 2:04 PM, Dennis Kaarsemaker den...@kaarsemaker.net wrote: diff --git a/t/t7508-status.sh b/t/t7508-status.sh index c987b5e..2bd7ef1 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -198,6 +198,13 @@ test_expect_success 'status -s' ' ' +test_expect_success

Re: [PATCH v3] gettext.c: detect the vsnprintf bug at runtime

2013-12-01 Thread Duy Nguyen
On Mon, Dec 2, 2013 at 7:31 AM, Trần Ngọc Quân vnwild...@gmail.com wrote: --- a/gettext.c +++ b/gettext.c @@ -29,6 +29,17 @@ int use_gettext_poison(void) #endif #ifndef NO_GETTEXT +static int test_vsnprintf(const char *fmt, ...) +{ + char buf[26]; + int ret; + va_list ap;

Pandora Jewelry christmas gifts

2013-12-01 Thread KathyMelton
It becomes smart to check new designs which can be released by Pandora Jewelry christmas gifts http://www.pandorachristmasgifts.com/ occasionally.Pandora jewelry is available at reasonable prices. That way, Pandora permits you to wear the jewelry of your choice with a much lesser price in

Re: git-svn troubles with calendarserver SVN repo

2013-12-01 Thread Matěj Cepl
On 30/11/13 09:54, Jon Seymour wrote: I have seen this behaviour, though never determined the root cause .Probably the simplest thing you can do without access to the server is to put your git svn fetch into a bash while loop, like so: while ! git svn fetch; do :; done; Of course, I did

Pandora Charms Sale

2013-12-01 Thread KathyMelton
Pandora jewelry as gift You possibly can customize the Pandora Charms Sale http://www.pandoracharmssale.co.uk/pandoraaccording to your dress for virtually any function or perhaps your mood using a particular day! Besides that, these bracelets may be gifted to any one at any sort of occasion

Pandora Jewelry

2013-12-01 Thread KathyMelton
Women became highly attracted to the lovely charms that in no Pandora Jewelry http://www.braceletscharmsale.com/pandora time it became a top brand already in the market. If you think deeper, it turned out just twenty five years ago that Enevoldsen made the initial Pandora charm ever, and now,

Nike Air Max 90 Herr Sverige

2013-12-01 Thread KathyMelton
Die erhöhte Exposition der Forschung und Entwicklung Nike Air Max 1 Dam Rea http://www.skorreabilligtsverige.com/nike-air-max hat viele Fortschritte in der Sneaker- Technologie Pionierarbeit geleistet. Die einzigen Hinweise, die uns einen Blick in die Zukunft Unternehmen Design-Ethos aus Film

Re: git-svn troubles with calendarserver SVN repo

2013-12-01 Thread Jon Seymour
My experience is that the fetch will be atomic - it either fetches an SVN commit or it doesn't. Failure during dcommit is more painful and I usually find it is necessary to manually use a git rebase to rebase the commits that didn't make it to SVN on top of the commits that did. jon. On Mon,

Re: [PATCH v3] gettext.c: detect the vsnprintf bug at runtime

2013-12-01 Thread Trần Ngọc Quân
On 02/12/2013 12:57, Duy Nguyen wrote: I suggest use C preprocessor instead. The person who complete git (make debian, rpm etc. package) decide enable it or not (disable by default). Most of people use git from distribution instead of complete it from source. #ifndef VSNPRINTF_OK