Re: [PATCH] submodule: add 'deinit' command

2012-12-02 Thread Junio C Hamano
Jens Lehmann writes: > Maybe the principle of least surprise is better followed when we > nuke the whole section, as it might surprise the user more to have > a setting resurrected he customized in the last life cycle of the > submodule than seeing that after an deinit followed by an init all > f

Anyone can go with a perles swarovski alternatively

2012-12-02 Thread weisma60
Around, forty brand new shops ought to be in position through 2001. Swarovski offers regarding 9200 workers, and contains continued to be the for yourself possessed loved ones company because it's beginning. I've noticed a few "rumors" that they're thinking about heading "public", however that's ju

you snapshot which the magnificent pandora bracelet charms

2012-12-02 Thread shoubul659
You’ll be able to pick from any variety of this sort of patterns at different [url=http://www.pandoracanadacharm.org/]pandora charms on sale[/url] retailers within your location. Below, you’ll be surprised to discover a big selection of allure beads to pick from. Regardless of whether you want gold

thomas sabo bracelet is absolutely some sort of acclaimed type

2012-12-02 Thread mushia322
What on earth is so extraordinary and unconventional on the subject of Thomas Sabo appeal bracelet asshole is usually that you have got the choice to select and opt for its possess appeal for being hooked up to your bracelet of your decision. towards your lovers, you may also opt for the best gift

[PATCH] status: respect advice.statusHints for ahead/behind advice

2012-12-02 Thread Jeff King
If the user has unset advice.statusHints, we already suppress the "use git reset to..." hints in each stanza. The new "use git push to publish..." hint is the same type of hint. Let's respect statusHints for it, rather than making the user set yet another advice flag. Signed-off-by: Jeff King ---

[PATCH] l10n: de.po: translate 22 new messages

2012-12-02 Thread Ralf Thielow
Translate 22 new messages came from git.pot updates in 9306b5b (l10n: Update git.pot (3 new, 6 removed messages)), fe52cd6 (l10n: Update git.pot (14 new, 3 removed messages)) and f9472e3 (l10n: Update git.pot (5 new, 1 removed messages)). Signed-off-by: Ralf Thielow --- po/de.po | 68 +++

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-12-02 Thread Ralf Thielow
Thanks Thomas and Michael! 2012/11/30 Thomas Rast : >> #: builtin/update-index.c:756 >> msgid "mark files as \"index-only\"" >> -msgstr "" >> +msgstr "markiert Dateien als \"index-only\"" > > Likewise, but here I don't even understand what the manpage is trying to > tell me, in particular I don

[PATCH 2/2] push: allow already-exists advice to be disabled

2012-12-02 Thread Chris Rorvick
Add 'advice.pushAlreadyExists' option to disable the advice shown when an update is rejected for a reference that is not allowed to update at all (verses those that are allowed to fast-forward.) Signed-off-by: Chris Rorvick --- Documentation/config.txt | 8 ++-- advice.c | 2

[PATCH 1/2] push: rename config variable for more general use

2012-12-02 Thread Chris Rorvick
The 'pushNonFastForward' advice config can be used to squelch several instances of push-related advice. Rename it to 'pushUpdateRejected' to cover other reject scenarios that are unrelated to fast-forwarding. Retain the old name for compatibility. Signed-off-by: Chris Rorvick --- Documentation/

[PATCH 0/2] push: honor advice.* configuration

2012-12-02 Thread Chris Rorvick
Added a new config option to turn off the already-exists advice. We also want to observe the 'pushNonFastForward' setting, but the name of this config is too narrow after this addition. Renamed to have broader scope while retaining the old name as an alias for backward- compatibility. Chris Rorv

Re: [PATCH] gitk: add a checkbox to control the visibility of tags

2012-12-02 Thread Felipe Contreras
On Sat, Dec 1, 2012 at 8:16 PM, Junio C Hamano wrote: > We _may_ want to unify these two "hidestuff" into a list of patterns > that hides any ref that match one of the patterns in the list, e.g. > > set hidestuff {refs/heads/*/* refs/tags/* refs/remotes/*} > > may hide all tags, all remot

[PATCH] gitk: read and write a repository specific configuration file

2012-12-02 Thread Łukasz Stelmach
Enable gitk read and write repository specific configuration file: ".git/k" if the file exists. To make gitk use the local file simply create one, e.g. with the touch(1) command. This is very useful if one uses different views for different repositories. Now there is no need to store all of them i

Re: [PATCH] gitk: add a checkbox to control the visibility of tags

2012-12-02 Thread Lukasz Stelmach
W dniu 02.12.2012 03:16, Junio C Hamano pisze: > Łukasz Stelmach writes: > >> Enable hiding of tags displayed in the tree as yellow labels. >> If a repository is used together with a system like Gerrit >> there may be quite a lot of tags used to control building >> and there may be hardly any pla

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-02 Thread W. Trevor King
From: "W. Trevor King" To: Jens Lehmann , Junio C Hamano Cc: Phil Hord , Git , Heiko Voigt , Jeff King , Shawn Pearce , Nahor Bcc: Subject: Re: [RFC] remove/deprecate 'submodule init' and 'sync' Reply-To: In-Reply-To: <50bbba29.2000...@web.de> <50bbb22a.7050...@web.de> <20121

[PATCH] remote.c: fix grammatical error in comment

2012-12-02 Thread Chris Rorvick
The sentence originally began "Note that ..." and was changed to "NOTE: ..." This change should have been made at the same time. Signed-off-by: Chris Rorvick --- This applies to the current cr/push-force-tag-update branch. It can probably just be folded into the last commit. Thanks, Chris

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-02 Thread Jens Lehmann
Am 02.12.2012 20:09, schrieb W. Trevor King: > Before I get into the details, I'd like to point out that I actually > understand the purpose of `submodule init` now ;). To avoid further > confusion, my current one-line command summaries would be: > > init: mark a submodule as active for futur

Re: [PATCH] submodule: add 'deinit' command

2012-12-02 Thread Jens Lehmann
Am 02.12.2012 03:00, schrieb Junio C Hamano: > Jens Lehmann writes: > >> With "git submodule init" the user is able to tell git he cares about one >> or more submodules and wants to have it populated on the next call to "git >> submodule update". But currently there is no easy way he could tell g

Re: [PATCH v5 0/2] submodule update: add --remote for submodule's upstream changes

2012-12-02 Thread Jens Lehmann
Am 30.11.2012 04:27, schrieb W. Trevor King: > On Thu, Nov 29, 2012 at 08:11:20PM -0500, Phil Hord wrote: >> On Thu, Nov 29, 2012 at 2:13 PM, W. Trevor King wrote: >>> On Thu, Nov 29, 2012 at 01:29:12PM -0500, Phil Hord wrote: But I really don't want to figure out how to handle submodule

Re: [RFC] remove/deprecate 'submodule init' and 'sync'

2012-12-02 Thread W. Trevor King
Before I get into the details, I'd like to point out that I actually understand the purpose of `submodule init` now ;). To avoid further confusion, my current one-line command summaries would be: init: mark a submodule as active for future submodule operation deinit: mark a submodule as ina

Re: [RFC] Add basic syntax check on shell scripts

2012-12-02 Thread Stefano Lattarini
On 12/02/2012 02:17 PM, Torsten Bögershausen wrote: > The test suite needs to be run on different platforms. > As it may be difficult for contributors to catch syntax > which work on GNU/linux, but is unportable, make a quick check > for the most common problems. > "sed -i", "echo -n" or "array in

[RFC] Add basic syntax check on shell scripts

2012-12-02 Thread Torsten Bögershausen
The test suite needs to be run on different platforms. As it may be difficult for contributors to catch syntax which work on GNU/linux, but is unportable, make a quick check for the most common problems. "sed -i", "echo -n" or "array in shell scripts" This list is not complete, and may need to be e

[PATCH] t9402: sed -i is not portable

2012-12-02 Thread Torsten Bögershausen
On some systems sed allows the usage of e.g. sed -i -e "s/line1/line2/" afile to edit the file "in place". Other systems don't allow that: one observed behaviour is that sed -i -e "s/line1/line2/" afile creates a backup file called afile-e, which breaks the test. As sed -i is not part of POSIX, avo

Re: [PATCH/RFC 1/5] mingw: make fgetc raise SIGINT if apropriate

2012-12-02 Thread Junio C Hamano
Erik Faye-Lund writes: > @@ -1538,13 +1563,7 @@ static sig_handler_t timer_fn = SIG_DFL; > static unsigned __stdcall ticktack(void *dummy) > { > while (WaitForSingleObject(timer_event, timer_interval) == > WAIT_TIMEOUT) { > - if (timer_fn == SIG_DFL) { > -

Re: [PATCH v6 2/8] push: add advice for rejected tag reference

2012-12-02 Thread Junio C Hamano
Chris Rorvick writes: > static void advise_pull_before_push(void) > { > if (!advice_push_non_ff_current || !advice_push_nonfastforward) > @@ -241,6 +245,11 @@ static void advise_checkout_pull_push(void) > advise(_(message_advice_checkout_pull_push)); > } > > +static void advise_r

Re: [PATCH 8/8] wrap_in_html(): process message in bulk rather than line-by-line

2012-12-02 Thread Michael Haggerty
On 12/02/2012 10:25 AM, Junio C Hamano wrote: > Michael Haggerty writes: > >> Nevertheless, the old code was even *more* broken because it added a >> "" regardless of whether the separator line had been seen,... > > OK. I'll rewrite the tail-end of the original log message to read: > > The

Re: [PATCH 0/5] ignore SIG{INT,QUIT} when launching editor

2012-12-02 Thread Junio C Hamano
Jeff King writes: > Since this can be thought of as "act more like system(3)", I wondered > whether the signal-ignore logic should be moved into run-command, or > even used by default for blocking calls to run_command (which are > basically our version of system(3)). But it is detrimental in the

Re: does a successful 'git gc' imply 'git fsck'

2012-12-02 Thread Junio C Hamano
Sitaram Chamarty writes: > If I could assume that a successful 'git gc' means an fsck is not > needed, I'd save a lot of time. Hence my question. When it does "repack -a", it at least scans the whole history so you would be sure that all the commits and trees are readable for the purpose of enu

Re: [PATCH 8/8] wrap_in_html(): process message in bulk rather than line-by-line

2012-12-02 Thread Junio C Hamano
Michael Haggerty writes: > Nevertheless, the old code was even *more* broken because it added a > "" regardless of whether the separator line had been seen,... OK. I'll rewrite the tail-end of the original log message to read: The old code would have created invalid output when there was no

Re: does a successful 'git gc' imply 'git fsck'

2012-12-02 Thread Sitaram Chamarty
On Sun, Dec 2, 2012 at 9:58 AM, Shawn Pearce wrote: > On Sat, Dec 1, 2012 at 6:31 PM, Sitaram Chamarty wrote: >> Background: I have a situation where I have to fix up a few hundred >> repos in terms of 'git gc' (the auto gc seems to have failed in many >> cases; they have far more than 6700 loose

Re: [PATCH v2 1/4] t4014: more tests about appending s-o-b lines

2012-12-02 Thread Brandon Casey
On Sat, Dec 1, 2012 at 11:06 PM, Torsten Bögershausen wrote: > On 22.11.12 17:38, Nguyễn Thái Ngọc Duy wrote: >> >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- >> t/t4014-format-patch.sh | 145 >> >> 1 file changed, 145 insertions(+) >> + echo