Authentication with e-mail address as user name for HTTPS remote

2013-08-30 Thread Patrick Atoon
Hello, I run into a problem with command line git on Linux. The remote git server I try to clone from uses HTTPS as a protocol and requires full fledged e-mail addresses for a user name in its authentication. In TortoiseGit (with winstore) or SourceTree, the user name and password are asked and s

Re: [PATCH v3 00/24] Index-v5

2013-08-30 Thread Thomas Gummerer
Junio C Hamano writes: > Duy Nguyen writes: > >> On Mon, Aug 19, 2013 at 2:41 AM, Thomas Gummerer >> wrote: >> >> I'm done reviewing this version (I neglected the extension writing >> patches because after spending hours on the main write patch I don't >> want to look at them anymore :p). Now

[PATCH 2/4] t: branch: fix typo

2013-08-30 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- t/t3200-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index ea548f9..3134652 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -351,7 +351,7 @@ test_expect_success 'test overriding tr

[PATCH 1/4] t: branch: trivial style fix

2013-08-30 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- t/t3200-branch.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 44ec6a4..ea548f9 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -14,7 +14,8 @@ test_expect_success 'prepare a trivial

[PATCH 3/4] t: branch: fix broken && chains

2013-08-30 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- t/t3200-branch.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 3134652..d85306f 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -425,14 +425,14 @@ test_expect_success '--set-up

[PATCH 4/4] t: branch: improve test rollback

2013-08-30 Thread Felipe Contreras
After every test the environment should be as close as to how it was before as possible. Signed-off-by: Felipe Contreras --- t/t3200-branch.sh | 71 +++ 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/t/t3200-branch.sh b/t/t3200

[PATCH 0/4] t: branch: fixes and cleanups

2013-08-30 Thread Felipe Contreras
Felipe Contreras (4): t: branch: trivial style fix t: branch: fix typo t: branch: fix broken && chains t: branch: improve test rollback t/t3200-branch.sh | 82 +++ 1 file changed, 41 insertions(+), 41 deletions(-) -- 1.8.4-fc -- To un

Re: [PATCH 6/6] pull: trivial cleanup

2013-08-30 Thread Junio C Hamano
Felipe Contreras writes: > There's no need to remove 'refs/heads/' yet again. > > Signed-off-by: Felipe Contreras > --- > git-pull.sh | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/git-pull.sh b/git-pull.sh > index f0df41c..3bdcbfd 100755 > --- a/git-pull.sh > +++ b/

Re: [PATCH 4/6] reset: trivial style cleanup

2013-08-30 Thread Junio C Hamano
Felipe Contreras writes: > Signed-off-by: Felipe Contreras > --- > builtin/reset.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/reset.c b/builtin/reset.c > index 225e3f1..7e65934 100644 > --- a/builtin/reset.c > +++ b/builtin/reset.c > @@ -323,7 +323,7 @@ int

Re: [PATCH 3/6] rebase: trivial style fixes

2013-08-30 Thread Junio C Hamano
Felipe Contreras writes: > Signed-off-by: Felipe Contreras > --- > git-rebase.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/git-rebase.sh b/git-rebase.sh > index 8d7659a..2c02853 100755 > --- a/git-rebase.sh > +++ b/git-rebase.sh > @@ -324,7 +324,7 @@ done > t

Re: [PATCH 5/6] add: trivial style cleanup

2013-08-30 Thread Junio C Hamano
Felipe Contreras writes: > Signed-off-by: Felipe Contreras > --- > builtin/add.c | 10 +- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/builtin/add.c b/builtin/add.c > index 8266a9c..a1e1e0e 100644 > --- a/builtin/add.c > +++ b/builtin/add.c > @@ -336,7 +336,7 @@ st

Re: [PATCH 1/6] reset: trivial refactoring

2013-08-30 Thread Junio C Hamano
Felipe Contreras writes: > After commit 3fde386 (reset [--mixed]: use diff-based reset whether or > not pathspec was given), some code can be moved to the 'reset_type == > MIXED' check. Makes sense. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to maj

Re: [PATCH 2/6] branch: trivial style fix

2013-08-30 Thread Junio C Hamano
Good. Thanks. -- 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

[PATCH v2] Document pack v4 format

2013-08-30 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Incorporated suggestions by Nico and Junio. I went ahead and added escape hatches for converting thin packs to full ones so the document does not really match the code (I've been watching Nico's repository, commit reading is added, good stuff!) The pr

Re: [PATCH] remote-hg: skip ill-formed references

2013-08-30 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 8:15 PM, Max Kirillov wrote: > References which fail check_refname_format() cause the whole > import to fail. This might be undesirable if the references > are not important. > > A better solution would be to provide some mapping, either > by some reversible encoding, or by

Re: [PATCH] Add testcase for needless objects during a shallow fetch

2013-08-30 Thread Duy Nguyen
On Thu, Aug 29, 2013 at 4:50 PM, Duy Nguyen wrote: > On Wed, Aug 28, 2013 at 11:02 PM, Matthijs Kooijman wrote: >> This is a testcase that checks for a problem where, during a specific >> shallow fetch where the client does not have any commits that are a >> successor of the new shallow root (i.e

[PATCH] remote-hg: skip ill-formed references

2013-08-30 Thread Max Kirillov
References which fail check_refname_format() cause the whole import to fail. This might be undesirable if the references are not important. A better solution would be to provide some mapping, either by some reversible encoding, or by generating and storing the associations locally. But this is al

[PATCH] Make setup_git_env() resolve .git file when $GIT_DIR is not specified

2013-08-30 Thread Nguyễn Thái Ngọc Duy
This makes reinitializing on a .git file repository work. This is probably the only case that setup_git_env() (via set_git_dir()) is called on a .git file. Other cases in setup_git_dir_gently() and enter_repo() both cover .git file case explicitly because they need to verify the target repo is val

Re: [PATCH] revision: introduce --exclude= to tame wildcards

2013-08-30 Thread Junio C Hamano
Duy Nguyen writes: > On Sat, Aug 31, 2013 at 6:55 AM, Junio C Hamano wrote: >> +static int ref_excluded(struct rev_info *revs, const char *path) >> +{ >> + struct string_list_item *item; >> + >> + if (!revs->ref_excludes) >> + return 0; >> + for_each_string_list_i

Re: [PATCH] revision: introduce --exclude= to tame wildcards

2013-08-30 Thread Duy Nguyen
On Sat, Aug 31, 2013 at 6:55 AM, Junio C Hamano wrote: > +static int ref_excluded(struct rev_info *revs, const char *path) > +{ > + struct string_list_item *item; > + > + if (!revs->ref_excludes) > + return 0; > + for_each_string_list_item(item, revs->ref_excludes)

Re: [RFC/PATCH v2 3/3] status: introduce status.displayCommentChar to disable display of #

2013-08-30 Thread brian m. carlson
On Wed, Aug 28, 2013 at 04:18:03PM -0400, Jeff King wrote: > On Wed, Aug 28, 2013 at 01:05:38PM -0700, Junio C Hamano wrote: > > > What are our plans to help existing scripts people have written over > > time, especially before "status -s" was invented, that will be > > broken by use of this? > >

[PATCH] revision: introduce --exclude= to tame wildcards

2013-08-30 Thread Junio C Hamano
People often find "git log --branches" etc. that includes _all_ branches is cumbersome to use when they want to grab most but except some. The same applies to --tags, --all and --glob. Teach the revision machinery to remember patterns, and then upon the next such a globbing option, exclude those

[PATCH] gitk: fix race error at click while reading commits

2013-08-30 Thread Max Kirillov
If I click the commit list while reading (or rereading, by Shift-F5) commits, sometimes an error message appears: `can't read "pending_select": no such variable', because pending_select is reset during update. Just removing update or saving value in local variable would result in occasional scroll

[PATCH 2/2] branch: reorganize verbose options

2013-08-30 Thread Felipe Contreras
Showing the upstream tracking branch is more important than how many commits are ahead/behind, so now 'git branch -v' shows the upstream, but not the tracking info, and 'git branch -vv' shows all information (as before). Signed-off-by: Felipe Contreras --- builtin/branch.c | 22 +

[PATCH 0/2] branch: improve verbose option

2013-08-30 Thread Felipe Contreras
Hi, This has been discussed before: http://thread.gmane.org/gmane.comp.version-control.git/224489 but in the spirit of the perfect being the enemy of the good, nothing got done. This series makes 'git branch -v' much faster, and gives us the most important information; the configured upstream t

[PATCH 1/2] branch: trivial cleanup

2013-08-30 Thread Felipe Contreras
No functional changes. Signed-off-by: Felipe Contreras --- builtin/branch.c | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0836890..ac17b18 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -425,16 +425,15

Re: [PATCH v2 7/8] update-ref: support multiple simultaneous updates

2013-08-30 Thread Junio C Hamano
Brad King writes: > Add a --stdin signature to read update instructions from standard input > and apply multiple ref updates together. Use an input format that > supports any update that could be specified via the command-line, > including object names like 'branch:path with space'. > > Signed-o

[PATCH 5/6] add: trivial style cleanup

2013-08-30 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- builtin/add.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index 8266a9c..a1e1e0e 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -336,7 +336,7 @@ static int edit_patch(int argc, const char **arg

[PATCH 4/6] reset: trivial style cleanup

2013-08-30 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- builtin/reset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/reset.c b/builtin/reset.c index 225e3f1..7e65934 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -323,7 +323,7 @@ int cmd_reset(int argc, const char **argv, const

[PATCH 1/6] reset: trivial refactoring

2013-08-30 Thread Felipe Contreras
After commit 3fde386 (reset [--mixed]: use diff-based reset whether or not pathspec was given), some code can be moved to the 'reset_type == MIXED' check. Let's move the code that is specific to MIXED. Signed-off-by: Felipe Contreras --- builtin/reset.c | 9 +++-- 1 file changed, 3 insertio

[PATCH 3/6] rebase: trivial style fixes

2013-08-30 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- git-rebase.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 8d7659a..2c02853 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -324,7 +324,7 @@ done test $# -gt 2 && usage if test -n "$cmd" && -

[PATCH 6/6] pull: trivial cleanup

2013-08-30 Thread Felipe Contreras
There's no need to remove 'refs/heads/' yet again. Signed-off-by: Felipe Contreras --- git-pull.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index f0df41c..3bdcbfd 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -166,7 +166,6 @@ error_on_no_mer

[PATCH 0/6] Trivial cleanups and fixes

2013-08-30 Thread Felipe Contreras
Felipe Contreras (6): reset: trivial refactoring branch: trivial style fix rebase: trivial style fixes reset: trivial style cleanup add: trivial style cleanup pull: trivial cleanup branch.c| 2 +- builtin/add.c | 10 +- builtin/reset.c | 11 --- git-pull.sh

[PATCH 2/6] branch: trivial style fix

2013-08-30 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/branch.c b/branch.c index c5c6984..546c4b4 100644 --- a/branch.c +++ b/branch.c @@ -307,7 +307,7 @@ void create_branch(const char *head, start_name);

Re: [PATCH] gitweb: Fix the author initials in blame for non-ASCII names

2013-08-30 Thread Kyle J. McKay
On Aug 30, 2013, at 11:13, Junio C Hamano wrote: Junio C Hamano writes: Ævar Arnfjörð Bjarmason writes: Acked-by: Jakub Narębski Tested-by: Ævar Arnfjörð Bjarmason Tested-by: Simon Ruderich --- +++ b/gitweb/gitweb.perl @@ -6631,6 +6631,7 @@ sub git_blame_common { ... + binmode $fh

Re: Officially start moving to the term 'staging area'

2013-08-30 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 3:40 PM, Felipe Contreras wrote: > On Fri, Aug 30, 2013 at 2:11 PM, Felipe Contreras > wrote: >> On Thu, Aug 29, 2013 at 2:57 PM, Felipe Contreras >> wrote: > >>> Here are the threads once again: >>> >>> http://thread.gmane.org/gmane.comp.version-control.git/197111 >>> ht

Re: Officially start moving to the term 'staging area'

2013-08-30 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 2:11 PM, Felipe Contreras wrote: > On Thu, Aug 29, 2013 at 2:57 PM, Felipe Contreras > wrote: >> Here are the threads once again: >> >> http://thread.gmane.org/gmane.comp.version-control.git/197111 >> http://thread.gmane.org/gmane.comp.version-control.git/166675 >> http:/

Re: Officially start moving to the term 'staging area'

2013-08-30 Thread Felipe Contreras
On Thu, Aug 29, 2013 at 2:57 PM, Felipe Contreras wrote: > On Thu, Aug 29, 2013 at 1:37 PM, Junio C Hamano wrote: >> IIRC, when this was discussed, many non-native speakers had trouble >> with the verb "to stage", not just from i18n/l10n point of view. > > Well, you recall incorrectly. > > There

Re: What's cooking in git.git (Aug 2013, #07; Wed, 28)

2013-08-30 Thread Jens Lehmann
Am 29.08.2013 01:24, schrieb Junio C Hamano: > * bc/submodule-status-ignored (2013-08-20) 2 commits > - submodule: don't print status output with ignore=all > - submodule: fix confusing variable name > > Originally merged to 'next' on 2013-08-22 > > Will merge to 'next'. Looks like you didn'

Re: [PATCH v3 3/4] get rid of "git submodule summary --for-status"

2013-08-30 Thread Jens Lehmann
Am 29.08.2013 23:23, schrieb Matthieu Moy: > Jens Lehmann writes: > >> Am 29.08.2013 15:05, schrieb Matthieu Moy: >>> The --for-status option was an undocumented option used only by >>> wt-status.c, which inserted a header and commented out the output. We can >>> achieve the same result within wt

Re: [PATCH v3 3/4] get rid of "git submodule summary --for-status"

2013-08-30 Thread Jens Lehmann
Am 30.08.2013 21:40, schrieb Jens Lehmann: > Am 29.08.2013 23:23, schrieb Matthieu Moy: >> Jens Lehmann writes: >> >>> Am 29.08.2013 15:05, schrieb Matthieu Moy: The --for-status option was an undocumented option used only by wt-status.c, which inserted a header and commented out the out

Re: [PATCH v3 3/4] get rid of "git submodule summary --for-status"

2013-08-30 Thread Jens Lehmann
Am 30.08.2013 21:51, schrieb Jens Lehmann: > Am 30.08.2013 21:40, schrieb Jens Lehmann: >> Am 29.08.2013 23:23, schrieb Matthieu Moy: >>> Jens Lehmann writes: >>> Am 29.08.2013 15:05, schrieb Matthieu Moy: > The --for-status option was an undocumented option used only by > wt-status.c

[PATCHv2] has_sha1_file: re-check pack directory before giving up

2013-08-30 Thread Jeff King
On Fri, Aug 30, 2013 at 12:28:01AM -0400, Jeff King wrote: > On Thu, Aug 29, 2013 at 09:10:52PM -0400, Jeff King wrote: > > > In the case of git-fsck, which uses the > > DO_FOR_EACH_INCLUDE_BROKEN flag, this will cause us to > > erroneously complain that the ref points to an invalid > > object. B

Re: Officially start moving to the term 'staging area'

2013-08-30 Thread Felipe Contreras
On Thu, Aug 29, 2013 at 2:57 PM, Felipe Contreras wrote: > Again, *everyone* has agreed that index needs to be renamed, and > "staging area" is the best option. > > Do I really need to go through all the discussions and list each and > every person that participated in them, and show to you how e

Re: [PATCH] revision: add --except option

2013-08-30 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 11:48 AM, Junio C Hamano wrote: > Which means that the approach taken by the patch to only allow > exclusion of negative ones makes the idea only 50% useful compared > to its potential. And I suspect that "we can start from 50% which > is better than 0% and later fill the

Re: [PATCH] gitweb: Fix the author initials in blame for non-ASCII names

2013-08-30 Thread Simon Ruderich
On Fri, Aug 30, 2013 at 11:13:19AM -0700, Junio C Hamano wrote: > I think in this function the filehandle is called $fd, not $fh. Has > any of you really tested this??? I did, but I applied the change by hand without applying the patch directly and didn't notice the difference. Sorry for that. R

[PATCH v2 7/8] update-ref: support multiple simultaneous updates

2013-08-30 Thread Brad King
Add a --stdin signature to read update instructions from standard input and apply multiple ref updates together. Use an input format that supports any update that could be specified via the command-line, including object names like 'branch:path with space'. Signed-off-by: Brad King --- Document

[PATCH v2 6/8] refs: add update_refs for multiple simultaneous updates

2013-08-30 Thread Brad King
Add 'struct ref_update' to encode the information needed to update or delete a ref (name, new sha1, optional old sha1, no-deref flag). Add function 'update_refs' accepting an array of updates to perform. First sort the input array to order locks consistently everywhere and reject multiple updates

[PATCH v2 5/8] refs: add function to repack without multiple refs

2013-08-30 Thread Brad King
Generalize repack_without_ref as repack_without_refs to support a list of refs and implement the former in terms of the latter. Signed-off-by: Brad King --- refs.c | 29 ++--- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/refs.c b/refs.c index 5dd86ee..

[PATCH v2 2/8] refs: report ref type from lock_any_ref_for_update

2013-08-30 Thread Brad King
Expose lock_ref_sha1_basic's type_p argument to callers of lock_any_ref_for_update. Update all call sites to ignore it by passing NULL for now. Signed-off-by: Brad King --- branch.c |2 +- builtin/commit.c |2 +- builtin/fetch.c|3 ++- builtin/receive-pac

[PATCH v2 3/8] refs: factor update_ref steps into helpers

2013-08-30 Thread Brad King
Factor the lock and write steps and error handling into helper functions update_ref_lock and update_ref_write to allow later use elsewhere. Expose lock_any_ref_for_update's type_p to update_ref_lock callers. Signed-off-by: Brad King --- refs.c | 28 +++- 1 file changed,

[PATCH v2 8/8] update-ref: add test cases covering --stdin signature

2013-08-30 Thread Brad King
Extend t/t1400-update-ref.sh to cover cases using the --stdin option. Signed-off-by: Brad King --- t/t1400-update-ref.sh | 206 + 1 file changed, 206 insertions(+) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index e415ee0..9fd03fc

[PATCH v2 4/8] refs: factor delete_ref loose ref step into a helper

2013-08-30 Thread Brad King
Factor loose ref deletion into helper function delete_ref_loose to allow later use elsewhere. Signed-off-by: Brad King --- refs.c | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/refs.c b/refs.c index 2e755b4..5dd86ee 100644 --- a/refs.c +++ b/refs.c

Re: [PATCH] gitweb: Fix the author initials in blame for non-ASCII names

2013-08-30 Thread Junio C Hamano
Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > >> Acked-by: Jakub Narębski >> Tested-by: Ævar Arnfjörð Bjarmason >> Tested-by: Simon Ruderich >> --- >> +++ b/gitweb/gitweb.perl >> @@ -6631,6 +6631,7 @@ sub git_blame_common { >> ... >> +binmode $fh, ':utf8'; > > [Fri Aug 30 1

[PATCH v2 1/8] reset: rename update_refs to reset_refs

2013-08-30 Thread Brad King
The function resets refs rather than doing arbitrary updates. Rename it to allow a future general-purpose update_refs function to be added. Signed-off-by: Brad King --- builtin/reset.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c in

[PATCH v2 0/8] Multiple simultaneously locked ref updates

2013-08-30 Thread Brad King
Hi Folks, Here is the second revision of a series to support locking multiple refs at the same time to update all of them consistently. The first series can be found at $gmane/233260. This revision is ready to consider for integration. Updates since the previous revision of the series: * Incor

Re: [GIT PULL] hotfix on fr.po for the maint branch

2013-08-30 Thread Junio C Hamano
Jean-Noël AVILA writes: > Le vendredi 30 août 2013 09:54:59 Junio C Hamano a écrit : >> Jiang Xin writes: >> > Please merge this commit to the maint branch. >> > >> > The following changes since commit > e230c568c4b9a991e3175e5f65171a566fd8e39c: >> > Git 1.8.4 (2013-08-23 11:49:46 -0700) >>

Re: [PATCH] gitweb: Fix the author initials in blame for non-ASCII names

2013-08-30 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Acked-by: Jakub Narębski > Tested-by: Ævar Arnfjörð Bjarmason > Tested-by: Simon Ruderich > --- > gitweb/gitweb.perl | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl > index f429f75..ad48a5a 100755 > --- a/gitw

Re: [PATCH] gitweb: Fix the author initials in blame for non-ASCII names

2013-08-30 Thread Jakub Narębski
On Fri, Aug 30, 2013 at 8:05 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: >> Acked-by: Jakub Narębski >> Tested-by: Ævar Arnfjörð Bjarmason >> Tested-by: Simon Ruderich >> --- >> gitweb/gitweb.perl | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/gitweb/gitweb.perl

Re: [GIT PULL] hotfix on fr.po for the maint branch

2013-08-30 Thread Jean-Noël AVILA
Le vendredi 30 août 2013 09:54:59 Junio C Hamano a écrit : > Jiang Xin writes: > > Please merge this commit to the maint branch. > > > > The following changes since commit e230c568c4b9a991e3175e5f65171a566fd8e39c: > > Git 1.8.4 (2013-08-23 11:49:46 -0700) > > > > are available in the git repo

Re: [GIT PULL] hotfix on fr.po for the maint branch

2013-08-30 Thread Junio C Hamano
Jiang Xin writes: > Please merge this commit to the maint branch. > > The following changes since commit e230c568c4b9a991e3175e5f65171a566fd8e39c: > > Git 1.8.4 (2013-08-23 11:49:46 -0700) > > are available in the git repository at: > > git://github.com/git-l10n/git-po master > > for you to f

Re: [PATCH v2 1/5] replace: forbid replacing an object with one of a different type

2013-08-30 Thread Junio C Hamano
Christian Couder writes: > There is already a --force option, but I can add a --force-type in a > another patch. Oh, that was not what I meant. As long as existing --force override this check, that should be sufficient and more preferrable than yet another kind of "force". Thanks. -- To unsubs

Re: [PATCH] remote: filter out invalid remote configurations

2013-08-30 Thread Junio C Hamano
Carlos Martín Nieto writes: > On Tue, 2013-08-27 at 07:50 -0700, Junio C Hamano wrote: >> Carlos Martín Nieto writes: >> >> > In remote's configuration callback, anything that looks like >> > 'remote..*' creates a remote ''. This remote may not end >> > up having any configuration for a remote,

Re: [PATCH] revision: add --except option

2013-08-30 Thread Junio C Hamano
Felipe Contreras writes: >>> If you do 'master ^maint --except master', handle_commit will return >>> three commits: >> >> Would the same argument apply to >> >> next ^maint --except maint >> >> where next gets in the queue, maint in tainted, and skipped? > > maint is not skipped, as it's not t

[PATCH] Teach git to change to a given directory using -C option

2013-08-30 Thread Nazri Ramliy
This is similar in spirit to to "make -C dir ..." and "tar -C dir ...". Currently it takes more effort (keypresses) to invoke git command in a different directory than the current one without leaving the current directory: 1. (cd ~/foo && git status) git --git-dir=~/foo/.git --work-dir

Re: Stalled git cloning and possible solutions

2013-08-30 Thread Duy Nguyen
On Fri, Aug 30, 2013 at 7:17 PM, Duy Nguyen wrote: > OK how about a new capability "resume" to upload-pack. fetch-pack can > then send capability "resume[=,]" to upload-pack. The > first time it sends "resume" without parameters, and upload-pack will > send back an SHA-1 to identify the pack being

Re: [PATCH] remote: filter out invalid remote configurations

2013-08-30 Thread Carlos Martín Nieto
On Tue, 2013-08-27 at 07:50 -0700, Junio C Hamano wrote: > Carlos Martín Nieto writes: > > > In remote's configuration callback, anything that looks like > > 'remote..*' creates a remote ''. This remote may not end > > up having any configuration for a remote, but it's still in the list, > > so '

Re: Stalled git cloning and possible solutions

2013-08-30 Thread Duy Nguyen
On Fri, Aug 30, 2013 at 4:10 AM, Jonathan Nieder wrote: > V.Krishn wrote: > >> Quite sometimes when cloning a large repo stalls, hitting Ctrl+c cleans what >> been downloaded, and process needs re-start. >> >> Is there a way to recover or continue from already downloaded files during >> cloning ?

[PATCH] fix shell syntax error in template

2013-08-30 Thread Thorsten Glaser
an if clause must not be empty; add a "colon" command Signed-off-by: Thorsten Glaser --- templates/hooks--pre-push.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample index 15ab6d8..1f3bceb 100755 --- a/templates/hooks--p

[PATCH v2] git p4: implement view spec wildcards with "p4 where"

2013-08-30 Thread kazuki saitoh
Currently, git p4 does not support many of the view wildcards, such as * and %%n. It only knows the common ... mapping, and exclusions. Redo the entire wildcard code around the idea of directly querying the p4 server for the mapping. For each commit, invoke "p4 where" with committed file paths a

Re: [PATCH] revision: add --except option

2013-08-30 Thread Johannes Sixt
Am 8/30/2013 9:32, schrieb Felipe Contreras: > On Fri, Aug 30, 2013 at 2:26 AM, Junio C Hamano wrote: >> On Aug 30, 2013 12:19 AM, "Felipe Contreras" >> Would the same argument apply to >> >> next ^maint --except maint >> >> where next gets in the queue, maint in tainted, and skipped? > > main

[GIT PULL] hotfix on fr.po for the maint branch

2013-08-30 Thread Jiang Xin
Hi, Junio Please merge this commit to the maint branch. The following changes since commit e230c568c4b9a991e3175e5f65171a566fd8e39c: Git 1.8.4 (2013-08-23 11:49:46 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes up to 2186088

[PATCH] gitweb: Fix the author initials in blame for non-ASCII names

2013-08-30 Thread Ævar Arnfjörð Bjarmason
Change the @author_initials feature Jakub added in v1.6.4-rc2-14-ga36817b to match non-ASCII author initials as intended. The regexp Jakub added was intended to match non-ASCII (/\b([[:upper:]])\B/g). But in Perl this doesn't actually match non-ASCII upper-case characters unless the string being m

Re: [PATCH] revision: add --except option

2013-08-30 Thread Johannes Sixt
Am 8/30/2013 8:32, schrieb Junio C Hamano: > If you have a history where > > - branches "master" and "maint" point at commit A; > - branch "next" points at commit B that is a descendant of A; and > - there are tags X and Y pointing at commits that are ahead of B >or behind A > > i.e. > >

Re: [PATCH] revision: add --except option

2013-08-30 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 2:26 AM, Junio C Hamano wrote: > Pardon terseness, typo and HTML from a tablet. > > > On Aug 30, 2013 12:19 AM, "Felipe Contreras" > wrote: >> >> On Fri, Aug 30, 2013 at 1:32 AM, Junio C Hamano wrote: >> > Felipe Contreras writes: >> > >> >> So that it's possible to remo

Re: [PATCH] revision: add --except option

2013-08-30 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 2:11 AM, Johannes Sixt wrote: > Am 8/30/2013 7:00, schrieb Felipe Contreras: >> So that it's possible to remove certain refs from the list without >> removing the objects that are referenced by other refs. >> >> For example this repository: >> >> * 374e8dd (crap) crap >>

Re: [PATCHv7 0/2] Rewriting repack in C

2013-08-30 Thread Stefan Beller
On 08/29/2013 10:53 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Here is a diff since the last time sending this patch series: > > This is very readable. > > There may be people who misread "LOOSE" as "LOSE"; the option -A is > about making the unreachable ones loose so that they can

Re: [PATCH] revision: add --except option

2013-08-30 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 1:32 AM, Junio C Hamano wrote: > Felipe Contreras writes: > >> So that it's possible to remove certain refs from the list without >> removing the objects that are referenced by other refs. >> >> For example this repository: >> >> * 374e8dd (crap) crap >> * 4cbbf7b (tes

Re: [PATCH] revision: add --except option

2013-08-30 Thread Johannes Sixt
Am 8/30/2013 7:00, schrieb Felipe Contreras: > So that it's possible to remove certain refs from the list without > removing the objects that are referenced by other refs. > > For example this repository: > > * 374e8dd (crap) crap > * 4cbbf7b (test) two > * d025ae0 (HEAD, master) one > > W