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

2013-08-31 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

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

2013-08-31 Thread René Scharfe
Am 29.08.2013 22:36, schrieb Felipe Contreras: On Thu, Aug 29, 2013 at 3:03 PM, René Scharfe l@web.de wrote: If you have a --work-tree option then parseopt accepts --work as well, unless it's ambiguous, i.e. another option starts with --work, too. So you can have a descriptive, extra-long

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

2013-08-31 Thread Felipe Contreras
On Sat, Aug 31, 2013 at 2:46 AM, René Scharfe l@web.de wrote: Am 29.08.2013 22:36, schrieb Felipe Contreras: On Thu, Aug 29, 2013 at 3:03 PM, René Scharfe l@web.de wrote: If you have a --work-tree option then parseopt accepts --work as well, unless it's ambiguous, i.e. another option

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

2013-08-31 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 10:58 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: There's no need to remove 'refs/heads/' yet again. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-pull.sh | 3 +-- 1 file changed, 1

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

2013-08-31 Thread Jeff King
On Sat, Aug 31, 2013 at 08:52:06AM +0200, Patrick Atoon wrote: Here is what happens. First try cloning without specifying the user name: ---8--- $ git clone https://git.server.com/git/test.git Initialized empty Git repository in

[PATCH] branch: use $curr_branch_short more

2013-08-31 Thread René Scharfe
One of the first things git-pull.sh does is setting $curr_branch to the target of HEAD and $curr_branch_short to the same but with the leading refs/heads/ removed. Use $curr_branch_short in the function error_on_no_merge_candidates instead of removing the prefix from $curr_branch directly. The

Re: [PATCH] branch: use $curr_branch_short more

2013-08-31 Thread Felipe Contreras
Subject: branch: use $curr_branch_short more Why? I don't think that summary explains the reason for being for this patch, also, it starts with branch: instead of pull: Subject: pull: trivial simplification With that summary, people would have an easier time figuring out if they need to read

Re: [PATCH] branch: use $curr_branch_short more

2013-08-31 Thread René Scharfe
Am 31.08.2013 10:22, schrieb Felipe Contreras: Subject: branch: use $curr_branch_short more Why? I don't think that summary explains the reason for being for this patch, also, it starts with branch: instead of pull: You're right about branch vs. pull. I'll better go back to bed. ~_~

Bug in git rebase --continue in v1.8.4

2013-08-31 Thread Christoph Mallon
Hi, if I run rebase --continue (e.g. after a conflict resolution), then the rebase always ends with this error message: It seems that there is already a rebase-apply directory, and I wonder if you are in the middle of another rebase. If that is the case, please try

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

2013-08-31 Thread Max Kirillov
Felipe Contreras felipe.contreras at gmail.com writes: Which repository triggered this? Tha was some of the vim repositories, upstream https://code.google.com/p/vim/ or debian anonscm.debian.org/hg/pkg-vim/vim, or both. They contain tags with ~ symbol. I don't have any experience with

Re: [PATCH 0/2] branch: improve verbose option

2013-08-31 Thread Philip Oakley
From: Felipe Contreras felipe.contre...@gmail.com Sent: Friday, August 30, 2013 11:59 PM 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

git-rebase --continue eats commits

2013-08-31 Thread Madhu
Don't know if this has been resolved-by-debate here before, But if `git-rebase' finds a hitherto untracked file in the worktree, which it wants to create, it then aborts asking you to remove the file. So if you remove it and ask git to continue with `git-rebase --continue', it then deletes the

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

2013-08-31 Thread Ævar Arnfjörð Bjarmason
I did. I just clumsily sent out the wrong patch. I.e. tested it manually on another system, and then fat-fingered $fh instead of $fd. Should I send another patch or do you want to just fix this one up? On Fri, Aug 30, 2013 at 8:13 PM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano

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

2013-08-31 Thread Michael Haggerty
On 08/30/2013 08:12 PM, Brad King wrote: Factor loose ref deletion into helper function delete_ref_loose to allow later use elsewhere. Signed-off-by: Brad King brad.k...@kitware.com --- refs.c | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git

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

2013-08-31 Thread Jakub Narębski
On Fri, Aug 30, 2013 at 11:39 PM, Kyle J. McKay mack...@gmail.com wrote: On Aug 30, 2013, at 11:13, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Ævar Arnfjörð Bjarmason ava...@gmail.com writes: + binmode $fh, ':utf8'; What happens if the author name is written in

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

2013-08-31 Thread brian m. carlson
On Fri, Aug 30, 2013 at 10:08:53PM +0200, Jens Lehmann wrote: 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 jens.lehm...@web.de writes: Am 29.08.2013 15:05, schrieb Matthieu Moy: Because of

Re: [PATCH] branch: use $curr_branch_short more

2013-08-31 Thread Felipe Contreras
On Sat, Aug 31, 2013 at 5:28 AM, René Scharfe l@web.de wrote: Am 31.08.2013 11:22, schrieb Felipe Contreras: On Sat, Aug 31, 2013 at 4:11 AM, René Scharfe l@web.de wrote: Subject: pull: trivial simplification With that summary, people would have an easier time figuring out if they

Re: [PATCH 0/2] branch: improve verbose option

2013-08-31 Thread Felipe Contreras
On Sat, Aug 31, 2013 at 9:41 AM, Philip Oakley philipoak...@iee.org wrote: From: Felipe Contreras felipe.contre...@gmail.com Showing ahead/behind is not as important, I still find this useful - if it's up to date I don't need reminding of which remote / upstream tracking branch it's

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

2013-08-31 Thread Felipe Contreras
On Sat, Aug 31, 2013 at 8:58 AM, Max Kirillov m...@max630.net wrote: Felipe Contreras felipe.contreras at gmail.com writes: Which repository triggered this? Tha was some of the vim repositories, upstream https://code.google.com/p/vim/ or debian anonscm.debian.org/hg/pkg-vim/vim, or both.

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

2013-08-31 Thread Felipe Contreras
On Sat, Aug 31, 2013 at 8:58 AM, Max Kirillov m...@max630.net wrote: Felipe Contreras felipe.contreras at gmail.com writes: Which repository triggered this? Tha was some of the vim repositories, upstream https://code.google.com/p/vim/ or debian anonscm.debian.org/hg/pkg-vim/vim, or both.

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

2013-08-31 Thread Michael Haggerty
On 08/30/2013 08:12 PM, Brad King wrote: 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

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

2013-08-31 Thread Michael Haggerty
On 08/30/2013 08:12 PM, Brad King wrote: 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

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

2013-08-31 Thread Michael Haggerty
On 08/30/2013 08:11 PM, Brad King wrote: 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. I'm very interested in

[PATCH v3 05/11] Documentation/replace: add Creating Replacement Objects section

2013-08-31 Thread Christian Couder
There were no hints in the documentation about how to create replacement objects. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 16 1 file changed, 16 insertions(+) diff --git a/Documentation/git-replace.txt

[PATCH v3 00/11] Check replacement object type and minor updates

2013-08-31 Thread Christian Couder
In this new version of the series, the only change in the 5 first patches, is a small change in the commit message of patch 1. Patches from 6/11 to 11/11 are all new: - 6/11, 7/11 and 8/11 are about bypassing the type check if -f is used - 9/11, 10/11 and 11/11 are about

[PATCH v3 01/11] replace: forbid replacing an object with one of a different type

2013-08-31 Thread Christian Couder
Users replacing an object with one of a different type were not prevented to do so, even if it was obvious, and stated in the doc, that bad things would result from doing that. To avoid mistakes, it is better to just forbid that though. If one object is replaced with one of a different type, the

[PATCH v3 03/11] t6050-replace: test that objects are of the same type

2013-08-31 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index decdc33..5c352c4 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -263,4 +263,17 @@

[PATCH v3 04/11] t6050-replace: add test to clean up all the replace refs

2013-08-31 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 5c352c4..05be228 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -276,4 +276,10 @@ test_expect_success

[PATCH v3 02/11] Documentation/replace: state that objects must be of the same type

2013-08-31 Thread Christian Couder
A previous patch ensures that both the replaced and the replacement objects passed to git replace must be of the same type. While at it state that there is no other restriction on both objects. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 7 ---

[PATCH v3 06/11] replace: bypass the type check if -f option is used

2013-08-31 Thread Christian Couder
If -f option, which means '--force', is used, we can allow an object to be replaced with one of a different type, as the user should know what (s)he is doing. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[PATCH v3 08/11] t6050-replace: check that -f option bypasses the type check

2013-08-31 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 6 ++ 1 file changed, 6 insertions(+) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 05be228..0b07a0b 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -276,6 +276,12 @@ test_expect_success

[PATCH v3 10/11] Documentation/replace: list long option names

2013-08-31 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index a2bd2ee..414000e 100644 --- a/Documentation/git-replace.txt +++

[PATCH v3 11/11] t6050-replace: use some long option names

2013-08-31 Thread Christian Couder
So that they are tested a litlle bit too. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 0b07a0b..5dc26e8 100755 --- a/t/t6050-replace.sh +++

[PATCH v3 09/11] replace: allow long option names

2013-08-31 Thread Christian Couder
It is now standard practice in Git to have both short and long option names. So let's give a long option name to the git replace options too. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check

2013-08-31 Thread Christian Couder
Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 736b48c..a2bd2ee 100644 --- a/Documentation/git-replace.txt +++

Re: [PATCH] git send-email: include [anything]-by: signatures

2013-08-31 Thread Michael S. Tsirkin
On Mon, Aug 26, 2013 at 07:57:47PM +0300, Michael S. Tsirkin wrote: Consider [anything]-by: a valid signature. This includes Tested-by: Acked-by: Reviewed-by: etc. Signed-off-by: Michael S. Tsirkin m...@redhat.com Ping. Any opinion on whether this change is acceptable? ---

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

2013-08-31 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 2:56 AM, Johannes Sixt j.s...@viscovery.net wrote: 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

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

2013-08-31 Thread Felipe Contreras
On Fri, Aug 30, 2013 at 6:55 PM, Junio C Hamano gits...@pobox.com wrote: 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. This idea looks very familiar, from

[PATCH] diff: add a config option to control orderfile

2013-08-31 Thread Michael S. Tsirkin
I always want my diffs to show header files first, then .c files, then the rest. Make it possible to set orderfile though a config option to achieve this. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- diff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.c b/diff.c index

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

2013-08-31 Thread Max Kirillov
On Sat, Aug 31, 2013 at 12:57:34PM -0500, Felipe Contreras wrote: On Sat, Aug 31, 2013 at 8:58 AM, Max Kirillov m...@max630.net wrote: Tha was some of the vim repositories, upstream https://code.google.com/p/vim/ or debian anonscm.debian.org/hg/pkg-vim/vim, or both. They contain tags with ~

Proposal From Mr. Gibson Mouka.

2013-08-31 Thread Mr. Gibson Mouka
Dear Friend,   I decided to contact you to help me actualize this business for the mutual benefit of both our families. I am the Auditing and Accounting section manager in a bank, there is one of our customers who have made fixed deposit of sum of ($39.5)million for 7 years and upon maturity;

[PATCH v2] revision: add --except option

2013-08-31 Thread 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: C (crap) B (test) A (HEAD, master) When using '--branches --except crap': B (test) A (HEAD, master) But when using '--branches

Re: [PATCH v3 01/11] replace: forbid replacing an object with one of a different type

2013-08-31 Thread Philip Oakley
Sorry for not replying earlier in the series. From: Christian Couder chrisc...@tuxfamily.org Users replacing an object with one of a different type were not prevented to do so, even if it was obvious, and stated in the doc, that bad things would result from doing that. To avoid mistakes, it is

Re: [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check

2013-08-31 Thread Philip Oakley
From: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 736b48c..a2bd2ee

Re: [PATCH v3 05/11] Documentation/replace: add Creating Replacement Objects section

2013-08-31 Thread Philip Oakley
From: Christian Couder chrisc...@tuxfamily.org There were no hints in the documentation about how to create replacement objects. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Documentation/git-replace.txt | 16 1 file changed, 16 insertions(+) diff --git

Re: [PATCH v3 11/11] t6050-replace: use some long option names

2013-08-31 Thread Philip Oakley
From: Christian Couder chrisc...@tuxfamily.org Subject: [PATCH v3 11/11] t6050-replace: use some long option names So that they are tested a litlle bit too. s /litlle/little/ Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t6050-replace.sh | 8 1 file changed, 4

[PATCH 0/3] Reject non-ff pulls by default

2013-08-31 Thread Felipe Contreras
Junio already sent a similar patch, but I think this is simpler. Felipe Contreras (3): merge: simplify ff-only option t: replace pulls with merges pull: reject non-ff pulls by default Documentation/git-pull.txt | 1 + builtin/merge.c| 20

[PATCH 1/3] merge: simplify ff-only option

2013-08-31 Thread Felipe Contreras
No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/merge.c | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 34a6166..da9fc08 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@

[PATCH 3/3] pull: reject non-ff pulls by default

2013-08-31 Thread Felipe Contreras
For the full discussion: http://thread.gmane.org/gmane.comp.version-control.git/225146/focus=225305 The user still can specify 'git pull --merge' to restore the old behavior, or 'git config pull.rebase false'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH 2/3] t: replace pulls with merges

2013-08-31 Thread Felipe Contreras
This is what the code intended. No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/annotate-tests.sh| 2 +- t/t4200-rerere.sh | 2 +- t/t9114-git-svn-dcommit-merge.sh | 2 +-

Ṽɨᾍǧṝᾍ

2013-08-31 Thread Christen Blair
http://cyno-tavannes.ch/language/comon.php?page=4904127 -- 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] Turn off pathspec magic on {checkout,reset,add} -p on native Windows builds

2013-08-31 Thread Nguyễn Thái Ngọc Duy
git-add--interactive.perl rejects arguments with colons in 21e9757 (Hack git-add--interactive to make it work with ActiveState Perl - 2007-08-01). Pathspec magic starts with a colon, so it won't work if these pathspecs are passed to git-add--interactive.perl running with ActiveState Perl. Make

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

2013-08-31 Thread Eric Sunshine
On Fri, Aug 30, 2013 at 2:12 PM, Brad King brad.k...@kitware.com wrote: Extend t/t1400-update-ref.sh to cover cases using the --stdin option. Signed-off-by: Brad King brad.k...@kitware.com --- t/t1400-update-ref.sh | 206 + 1 file changed,

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

2013-08-31 Thread David Aguilar
On Sat, Aug 31, 2013 at 12:46 AM, René Scharfe l@web.de wrote: Am 29.08.2013 22:36, schrieb Felipe Contreras: On Thu, Aug 29, 2013 at 3:03 PM, René Scharfe l@web.de wrote: If you have a --work-tree option then parseopt accepts --work as well, unless it's ambiguous, i.e. another

Re: Re* [PATCH 1/8] remote-bzr: fix export of utf-8 authors

2013-08-31 Thread Michael Haggerty
On 08/29/2013 11:25 PM, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Actually, I think not fixing it inside that 1/8 is good, as there are many existing cmd file (and worse, cmd file-$x) in these test-*.sh scripts. Clean-up is better done as a follow-up patch. Here are

Re: Re* [PATCH 1/8] remote-bzr: fix export of utf-8 authors

2013-08-31 Thread Michael Haggerty
On 08/29/2013 11:24 PM, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Do I really need to quote the paragraph in CodingGuidelines? Existing violations are not an excuse to make things worse by adding more. I think with

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

2013-08-31 Thread Eric Sunshine
On Fri, Aug 30, 2013 at 9:35 AM, Nazri Ramliy ayieh...@gmail.com wrote: 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: