Re: [PATCH v2 7/7] bisect: allows any terms set by user

2015-06-17 Thread Matthieu Moy
Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr writes: Matthieu Moy matthieu@grenoble-inp.fr writes: # terms_defined is 0 when the user did not define the terms explicitely # yet. This is the case when running 'git bisect start bad_rev good_rev' # before we see an explicit

Re: [PATCH] notes: Use get_sha1_committish instead of read_ref in init_notes()

2015-06-17 Thread Junio C Hamano
Mike Hommey m...@glandium.org writes: I'm tempted to make init_notes itself do the check, based on the value it is given for a read_only argument. Yeah, that would be one sensible way to go after making sure that everything goes thru this interface. On the other hand, some commands do their

Re: [PATCH v3] pull: allow dirty tree when rebase.autostash enabled

2015-06-17 Thread Junio C Hamano
Kevin Daudt m...@ikke.info writes: rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the working tree is dirty when rebase.autostash is not enabled. Signed-off-by: Kevin Daudt m...@ikke.info Helped-by: Paul Tan

Re: [PATCH/RFC v4 10/10] send-email: suppress meaningless whitespaces in from field

2015-06-17 Thread Matthieu Moy
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes: if (defined $sender) { + $sender =~ s/^\s+|\s$//g; I would say \s+ also for the second \s. Not really different, but it feels wrong to iterate the substitution as many times as there are trailing spaces to remove. -- Matthieu

Re: [PATCH v2] git-checkout.txt: Document git checkout pathspec better

2015-06-17 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Yes, but Switch branchs or discard local changes still does not describe git checkout HEAD^^^ -- file.txt (restore to an old state, but does not switch branch) or git checkout -- file.txt (get from the index). You are right, especially when

Re: Should the --encoding argument to log/show commands make any guarantees about their output?

2015-06-17 Thread Junio C Hamano
Jan-Philip Gehrcke jgehr...@googlemail.com writes: I was surprised to see that the output of git log --encoding=utf-8 --format=format:%b can contain byte sequences that are invalid in UTF-8. Note: I am using git 2.1.4 and the %b format specifier represents the commit message body.

Re: [PATCH 0/2] rebase -i: Fix left-behind CHERRY_PICK_HEAD

2015-06-17 Thread Junio C Hamano
Johannes Schindelin johannes.schinde...@gmx.de writes: The symptom is that .git/CHERRY_PICK_HEAD is left behind after skipping an already-merged patch with `git rebase --continue` instead of `git rebase --skip`. I always prefer the former invocation because the latter would also skip

Re: [PATCH v2] git-checkout.txt: Document git checkout pathspec better

2015-06-17 Thread Torsten Bögershausen
On 2015-06-17 18.19, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Yes, but Switch branchs or discard local changes still does not describe git checkout HEAD^^^ -- file.txt (restore to an old state, but does not switch

Re: [PATCH] clone: check if server supports shallow clones

2015-06-17 Thread Jeff King
On Wed, Jun 17, 2015 at 09:35:23AM -0700, Junio C Hamano wrote: Of course it's hard to add to the test suite, since we do not have a way of hitting a server that does not understand shallow (I simply fudged server_supports() to return false on the client). We've had the shallow

Re: [PATCH v2] fetch-pack: check for shallow if depth given

2015-06-17 Thread Jeff King
On Wed, Jun 17, 2015 at 07:48:14AM -0400, Mike Edgar wrote: When a repository is first fetched as a shallow clone, either by git-clone or by fetching into an empty repo, the server's capabilities are not currently consulted. The client will send shallow requests even if the server does not

Re: Should the --encoding argument to log/show commands make any guarantees about their output?

2015-06-17 Thread Jan-Philip Gehrcke
On 17.06.2015 18:42, Junio C Hamano wrote: Jan-Philip Gehrcke jgehr...@googlemail.com writes: I was surprised to see that the output of git log --encoding=utf-8 --format=format:%b can contain byte sequences that are invalid in UTF-8. Note: I am using git 2.1.4 and the %b format

Re: [PATCH 2/2] Documentation on git-checkout --ours/--theirs improved

2015-06-17 Thread Junio C Hamano
Simon Eugster simon...@gmail.com writes: A better picture would be nice. And regarding the textual description, are you going to commit your version? Nah, I'd rather not take credit away from you ;-) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

[PATCH/RFC v4 10/10] send-email: suppress meaningless whitespaces in from field

2015-06-17 Thread Remi Lespinet
Matthieu Moy matthieu@grenoble-inp.fr writes Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes: if (defined $sender) { + $sender =~ s/^\s+|\s$//g; I would say \s+ also for the second \s. Not really different, but it feels wrong to iterate the substitution as many times

Re: [PATCH v2] git-checkout.txt: Document git checkout pathspec better

2015-06-17 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@grenoble-inp.fr writes: Yes, but Switch branchs or discard local changes still does not describe git checkout HEAD^^^ -- file.txt (restore to an old state, but does not switch branch) or git checkout -- file.txt (get from the

Re: [PATCH] notes: Use get_sha1_committish instead of read_ref in init_notes()

2015-06-17 Thread Jeff King
On Wed, Jun 17, 2015 at 06:02:46PM +0900, Mike Hommey wrote: In a sense that is weirdly broken already: $ git log --notes=:/foo /dev/null warning: notes ref refs/notes/:/foo is invalid but I wonder if we should be making expand_notes_ref a little more careful as part of the

Re: [PATCH] clone: check if server supports shallow clones

2015-06-17 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Thu, Jun 11, 2015 at 08:02:33PM +0700, Duy Nguyen wrote: I see that do_fetch_pack checks server_supports(shallow). Is that enough to cover all fetch cases? And if it is, why does it not cover the matching clone cases? I think this replacement check

Re: What's cooking in git.git (Jun 2015, #04; Tue, 16)

2015-06-17 Thread Junio C Hamano
Remi Galan Alfonso remi.galan-alfo...@ensimag.grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: * gr/rebase-i-drop-warn (2015-06-01) 2 commits - git rebase -i: warn about removed commits - git-rebase -i: add command drop to remove a commit Add drop commit-object-name subject

Re: [PATCH/RFC v4 07/10] send-email: reduce dependancies impact on parse_address_line

2015-06-17 Thread Matthieu Moy
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes: --- git-send-email.perl | 54 +++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index a0cd7ff..a1f6c18 100755 ---

Git completion not using ls-remote to auto-complete during push

2015-06-17 Thread Robert Dailey
I do the following: $ git push origin :topic If I stop halfway through typing 'topic' and hit TAB, auto-completion does not work if I do not have a local branch by that name (sometimes I delete my local branch first, then I push to delete it remotely). I thought that git completion code was

Re: [PATCH v2] git-checkout.txt: Document git checkout pathspec better

2015-06-17 Thread Torsten Bögershausen
On 2015-06-17 17.29, Junio C Hamano wrote: Matthieu Moy matthieu@grenoble-inp.fr writes: Yes, but Switch branchs or discard local changes still does not describe git checkout HEAD^^^ -- file.txt (restore to an old state, but does not switch branch) or git checkout -- file.txt (get from

Re: [PATCH/RFC v4 05/10] send-email: Allow use of aliases in the From field of --compose mode

2015-06-17 Thread Matthieu Moy
Remi Lespinet remi.lespi...@ensimag.grenoble-inp.fr writes: Aliases were expanded before checking the From field of the checking is misleading here. I thought you meant check that the From field is well-formed, while you mean set $sender based on the From: field. --compose option. This is

<    1   2