Re: [PATCH v2] git-p4: fix faulty paths for case insensitive systems

2015-08-19 Thread Torsten Bögershausen
Some nit-picking below: On 08/19/2015 10:04 PM, larsxschnei...@gmail.com wrote: From: Lars Schneider PROBLEM: We run P4 servers on Linux and P4 clients on Windows. For an unknown reason the file path for a number of files in P4 does not match the directory path with respect to case sensitivity.

Re: [PATCH] generate-cmdlist: re-implement as shell script

2015-08-19 Thread Junio C Hamano
Eric Sunshine writes: > In addition to reviving 527ec39^:generate-cmdlist.sh and extending it, I > also re-indented it with tabs instead of spaces, so it's helpful to > ignore whitespace changes when comparing the old and new versions of the > shell script. Hmph. Perhaps we can view it as part

[PATCH] generate-cmdlist: re-implement as shell script

2015-08-19 Thread Eric Sunshine
527ec39 (generate-cmdlist: parse common group commands, 2015-05-21) replaced generate-cmdlist.sh with a more functional Perl version, generate-cmdlist.perl. The Perl version gleans named tags from a new "common groups" section in command-list.txt and recognizes those tags in "command list" section

Re: [PATCH v2 2/9] Documentation/git-send-pack.txt: Flow long synopsis line

2015-08-19 Thread Junio C Hamano
Dave Borowitz writes: > I produced the patch with "git format-patch --subject-prefix='PATCH > v2' --cover-letter @{u}.." and mailed with "git send-email > --to=git@vger.kernel.org,gits...@pobox.com 0*.patch"; is there a way > that would have preserved whitespace better? No need to worry, I suspe

[PATCH v2] git-p4: fix faulty paths for case insensitive systems

2015-08-19 Thread larsxschneider
From: Lars Schneider PROBLEM: We run P4 servers on Linux and P4 clients on Windows. For an unknown reason the file path for a number of files in P4 does not match the directory path with respect to case sensitivity. E.g. `p4 files` might return //depot/path/to/file1 //depot/PATH/to/file2 If you

[PATCH v2] git-p4: fix faulty paths for case insensitive systems

2015-08-19 Thread larsxschneider
From: Lars Schneider Hi, as discussed with Luke in "[PATCH] git-p4: fix faulty paths for case insensitive systems" I added a test case for my path fix. I also changed the trigger for the fix to the command line parameter "--fix-paths". Cheers, Lars Lars Schneider (1): git-p4: fix faulty path

Re: [PATCH v2 8/9] Support signing pushes iff the server supports it

2015-08-19 Thread Dave Borowitz
On Wed, Aug 19, 2015 at 3:58 PM, Junio C Hamano wrote: > Dave Borowitz writes: > >> Add a new flag --signed-if-possible to push and send-pack that sends a >> push certificate if and only if the server advertised a push cert >> nonce. If not, at least warn the user that their push may not be as >>

Re: [PATCH v2 2/9] Documentation/git-send-pack.txt: Flow long synopsis line

2015-08-19 Thread Dave Borowitz
On Wed, Aug 19, 2015 at 3:56 PM, Junio C Hamano wrote: > Dave Borowitz writes: > >> Signed-off-by: Dave Borowitz >> --- >> Documentation/git-send-pack.txt | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/git-send-pack.txt >> b/Documentation/git-send-p

Re: [PATCH v2 8/9] Support signing pushes iff the server supports it

2015-08-19 Thread Junio C Hamano
Dave Borowitz writes: > Add a new flag --signed-if-possible to push and send-pack that sends a > push certificate if and only if the server advertised a push cert > nonce. If not, at least warn the user that their push may not be as > secure as they thought. > > Signed-off-by: Dave Borowitz > --

BUG REPORT: gitk displays diffs with angle brackets incorrectly

2015-08-19 Thread Yojem Mejoy
Summary: Certain diffs containing angle brackets ('<' or '>' characters) are displayed incorrectly in gitk's "markup words" and "color words" modes. The bug is caused by a feature that isn't aware of the formatting difference for the word diff modes. How to reproduce the bug:   Create a file wi

Re: [PATCH v2 2/9] Documentation/git-send-pack.txt: Flow long synopsis line

2015-08-19 Thread Junio C Hamano
Dave Borowitz writes: > Signed-off-by: Dave Borowitz > --- > Documentation/git-send-pack.txt | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt > index b5d09f7..6a6 100644 > --- a/Documentation/git-sen

[BUG/PATCH] t9350-fast-export: Add failing test for symlink-to-directory

2015-08-19 Thread Anders Kaseorg
git fast-export | git fast-import fails to preserve a commit that replaces a symlink with a directory. Add a failing test case demonstrating this bug. The fast-export output for the commit in question looks like commit refs/heads/master mark :4 author … committer … data 4 two M 1

Re: [PATCH v2 7/9] builtin/send-pack.c: Use option parsing API

2015-08-19 Thread Dave Borowitz
On Wed, Aug 19, 2015 at 2:00 PM, Stefan Beller wrote: > On Wed, Aug 19, 2015 at 8:26 AM, Dave Borowitz wrote: >> The old option parsing code in this plumbing command predates this >> API, so option parsing was done more manually. Using the new API >> brings send-pack more in line with push, and a

Re: [PATCH 7/7] submodule: implement `module_clone` as a builtin helper

2015-08-19 Thread Stefan Beller
On Wed, Aug 19, 2015 at 12:08 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> `module_clone` is part of the update command, which I want to convert >> to C next. >> >> Signed-off-by: Stefan Beller >> --- >> >> This is the only patch that broke by a last minute fix, >> so this replaces the

Re: [PATCH 7/7] submodule: implement `module_clone` as a builtin helper

2015-08-19 Thread Junio C Hamano
Stefan Beller writes: > `module_clone` is part of the update command, which I want to convert > to C next. > > Signed-off-by: Stefan Beller > --- > > This is the only patch that broke by a last minute fix, > so this replaces the previous PATCH 7/7. ... which still breaks 7400.82, though. Outpu

Re: [PATCH v12 03/13] ref-filter: introduce the ref_formatting_state stack machinery

2015-08-19 Thread Junio C Hamano
Matthieu Moy writes: > You replaced the quote_style argument with ref_formatting_state, and I > think you should have kept this argument and added ref_formatting_state. > The other option is to add an extra indirection like > > struct ref_formatting_state { > int quote_style; > struct

Re: [PATCH 5/7] submodule: implement `module_list` as a builtin helper

2015-08-19 Thread Stefan Beller
On Wed, Aug 19, 2015 at 11:22 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Micronit. Even though multiplication is commutative, the order of >> arguments to xcalloc() looks odd. It lets you say "I want an array >> with nmemb elements, and each of its is size-bytes long" by giving >>

Re: [PATCH 5/7] submodule: implement `module_list` as a builtin helper

2015-08-19 Thread Stefan Beller
On Wed, Aug 19, 2015 at 11:17 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> +static int module_list_compute(int argc, const char **argv, >> + const char *prefix, >> + struct pathspec *pathspec) >> +{ >> + int i; >> + char *m

Re: [PATCH 5/7] submodule: implement `module_list` as a builtin helper

2015-08-19 Thread Junio C Hamano
Junio C Hamano writes: > Micronit. Even though multiplication is commutative, the order of > arguments to xcalloc() looks odd. It lets you say "I want an array > with nmemb elements, and each of its is size-bytes long" by giving > it nmemb and then size. Unrelated tangent, but while I have out

Re: [PATCH 5/7] submodule: implement `module_list` as a builtin helper

2015-08-19 Thread Junio C Hamano
Stefan Beller writes: > +static int module_list_compute(int argc, const char **argv, > + const char *prefix, > + struct pathspec *pathspec) > +{ > + int i; > + char *max_prefix, *ps_matched = NULL; > + int max_prefix_len; > +

Re: [PATCH 4/7] submodule: Allow errornous values for the fetchrecursesubmodules option

2015-08-19 Thread Junio C Hamano
Stefan Beller writes: > From: Heiko Voigt > > We should not die when reading the submodule config cache since the user > might not be able to get out of that situation when the configuration is > part of the history. > > We should handle this condition later when the value is about to be > used.

Re: [PATCH v2 7/9] builtin/send-pack.c: Use option parsing API

2015-08-19 Thread Stefan Beller
On Wed, Aug 19, 2015 at 8:26 AM, Dave Borowitz wrote: > The old option parsing code in this plumbing command predates this > API, so option parsing was done more manually. Using the new API > brings send-pack more in line with push, and accepts new variants > like --no-* for negating options. > >

Re: [PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

2015-08-19 Thread Junio C Hamano
Paul Tan writes: > (In addition, I fixed a small mistake with the "struct tree_desc" array > size.) Yeah, one thing I forgot to mention was that I suspect this kind of "oneway merge" already in other places in the code, and a future mini-project might be to inspect them all and try to see if the

Re: [PATCH v4 0/3] dt/untracked-subdir

2015-08-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The first patch is a split from David's v3 patch because it should > belong to dt/untracked-sparse. The second is basically David's v3. > The third patch fixes untracked_cache_invalidate_path(). David fixed > it in v2, but there's another bug in this code. > > Davi

Re: [PATCH v12 03/13] ref-filter: introduce the ref_formatting_state stack machinery

2015-08-19 Thread Karthik Nayak
On Wed, Aug 19, 2015 at 9:24 PM, Karthik Nayak wrote: > On Wed, Aug 19, 2015 at 9:14 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> --- a/ref-filter.c +++ b/ref-filter.c @@ -155,6 +155,8 @@ static void push_new_state(struct ref_formatting_state **stack)

Re: [PATCH v2 3/8] branch: roll show_detached HEAD into regular ref_list

2015-08-19 Thread Karthik Nayak
On Wed, Aug 19, 2015 at 8:48 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> + /* >> + * First we obtain all regular branch refs and if the HEAD is >> + * detached then we insert that ref to the end of the ref_fist >> + * so that it can be printed first. >> + */ > > N

Re: [PATCH v2 5/8] branch: drop non-commit error reporting

2015-08-19 Thread Karthik Nayak
On Wed, Aug 19, 2015 at 8:53 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> Remove the error reporting variable to make the code easier to port >> over to using ref-filter APIs. This variable is not require as in > > s/is not require/&d/ > Will change. -- Regards, Karthik Nayak -- To u

Re: [PATCH v12 03/13] ref-filter: introduce the ref_formatting_state stack machinery

2015-08-19 Thread Karthik Nayak
On Wed, Aug 19, 2015 at 9:14 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >>> --- a/ref-filter.c >>> +++ b/ref-filter.c >>> @@ -155,6 +155,8 @@ static void push_new_state(struct ref_formatting_state >>> **stack) >>> >>> strbuf_init(&s->output, 0); >>> s->prev = *stack; >>> +

Re: [RFC/PATCH 10/11] branch.c: use 'ref-filter' APIs

2015-08-19 Thread Karthik Nayak
On Wed, Aug 19, 2015 at 9:19 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Thu, Jul 30, 2015 at 12:59 PM, Matthieu Moy >> wrote: >> >>> IIRC, historicaly Git allowed some weirdly named refs which made some >>> commands ambiguous (e.g. a branch named after an option like '-d'). >>> We'r

Re: [PATCH v12 10/13] tag.c: use 'ref-filter' data structures

2015-08-19 Thread Karthik Nayak
On Wed, Aug 19, 2015 at 8:26 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> This is a temporary step before porting 'tag.c' to use 'ref-filter' >> completely. As this is a temporary step, most of the code >> introduced here will be removed when 'tag.c' is ported over to use >> 'ref-filter'

Re: [RFC/PATCH 10/11] branch.c: use 'ref-filter' APIs

2015-08-19 Thread Matthieu Moy
Karthik Nayak writes: > On Thu, Jul 30, 2015 at 12:59 PM, Matthieu Moy > wrote: > >> IIRC, historicaly Git allowed some weirdly named refs which made some >> commands ambiguous (e.g. a branch named after an option like '-d'). >> We're forbidding their creation so people shouldn't have any, but w

Re: [PATCH v12 03/13] ref-filter: introduce the ref_formatting_state stack machinery

2015-08-19 Thread Matthieu Moy
Karthik Nayak writes: >> --- a/ref-filter.c >> +++ b/ref-filter.c >> @@ -155,6 +155,8 @@ static void push_new_state(struct ref_formatting_state >> **stack) >> >> strbuf_init(&s->output, 0); >> s->prev = *stack; >> + if (*stack) >> + s->quote_style = (*stack)->

Re: [PATCH v12 03/13] ref-filter: introduce the ref_formatting_state stack machinery

2015-08-19 Thread Karthik Nayak
On Wed, Aug 19, 2015 at 8:26 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> +static void pop_state(struct ref_formatting_state **stack) >> +{ >> + struct ref_formatting_state *current = *stack; >> + struct ref_formatting_state *prev = current->prev; >> + >> + if (prev) >> +

Re: [PATCH v12 01/13] ref-filter: move `struct atom_value` to ref-filter.c

2015-08-19 Thread Karthik Nayak
On Wed, Aug 19, 2015 at 8:26 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> +static void end_atom_handler(struct atom_value *atomv, struct >> ref_formatting_state **state) >> +{ >> + struct ref_formatting_state *current = *state; >> + if (!current->at_end) >> + die(_("f

[PATCH v2 9/9] Add a config option push.gpgSign for default signed pushes

2015-08-19 Thread Dave Borowitz
Signed-off-by: Dave Borowitz --- Documentation/config.txt | 8 builtin/push.c | 50 ++-- builtin/send-pack.c | 27 +- 3 files changed, 70 insertions(+), 15 deletions(-) diff --git a/Documentation/config.

[PATCH v2 3/9] Documentation/git-send-pack.txt: Document --signed

2015-08-19 Thread Dave Borowitz
Signed-off-by: Dave Borowitz --- Documentation/git-send-pack.txt | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index 6a6..0a0a3fb 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentatio

[PATCH v2 5/9] transport: Remove git_transport_options.push_cert

2015-08-19 Thread Dave Borowitz
This field was set in transport_set_option, but never read in the push code. The push code basically ignores the smart_options field entirely, and derives its options from the flags arguments to the push* callbacks. Note that in git_transport_push there are already several args set from flags that

[PATCH v2 6/9] config.c: Expose git_parse_maybe_bool

2015-08-19 Thread Dave Borowitz
Signed-off-by: Dave Borowitz --- cache.h | 1 + config.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cache.h b/cache.h index 6bb7119..95d9594 100644 --- a/cache.h +++ b/cache.h @@ -1392,6 +1392,7 @@ extern int git_config_with_options(config_fn_t fn, void *,

[PATCH v2 7/9] builtin/send-pack.c: Use option parsing API

2015-08-19 Thread Dave Borowitz
The old option parsing code in this plumbing command predates this API, so option parsing was done more manually. Using the new API brings send-pack more in line with push, and accepts new variants like --no-* for negating options. Signed-off-by: Dave Borowitz --- builtin/send-pack.c | 163 +

[PATCH v2 2/9] Documentation/git-send-pack.txt: Flow long synopsis line

2015-08-19 Thread Dave Borowitz
Signed-off-by: Dave Borowitz --- Documentation/git-send-pack.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index b5d09f7..6a6 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentation/git-send

[PATCH v2 4/9] gitremote-helpers.txt: Document pushcert option

2015-08-19 Thread Dave Borowitz
Signed-off-by: Dave Borowitz --- Documentation/gitremote-helpers.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt index 82e2d15..78e0b27 100644 --- a/Documentation/gitremote-helpers.txt +++ b/Documentation/gitrem

[PATCH v2 8/9] Support signing pushes iff the server supports it

2015-08-19 Thread Dave Borowitz
Add a new flag --signed-if-possible to push and send-pack that sends a push certificate if and only if the server advertised a push cert nonce. If not, at least warn the user that their push may not be as secure as they thought. Signed-off-by: Dave Borowitz --- Documentation/git-push.txt |

[PATCH v2 0/9] Flags and config to sign pushes by default

2015-08-19 Thread Dave Borowitz
Changes since v1: - Rebased on 44e02239 - Use options --[no-]signed|--signed=(yes|no|if-asked) - Support general yes/true/1/etc. option parsing. - Convert builtin/send-pack.c to use option parsing API for better code reuse. - Various cleanups as suggested by Junio. v1 can be found at: http

[PATCH v2 1/9] Documentation/git-push.txt: Document when --signed may fail

2015-08-19 Thread Dave Borowitz
Like --atomic, --signed will fail if the server does not advertise the necessary capability. In addition, it requires gpg on the client side. Signed-off-by: Dave Borowitz --- Documentation/git-push.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-push.

Re: [PATCH v2 5/8] branch: drop non-commit error reporting

2015-08-19 Thread Matthieu Moy
Karthik Nayak writes: > Remove the error reporting variable to make the code easier to port > over to using ref-filter APIs. This variable is not require as in s/is not require/&d/ -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git

Re: [PATCH 6/7] Support signing pushes iff the server supports it

2015-08-19 Thread Dave Borowitz
On Fri, Aug 14, 2015 at 7:22 PM, Junio C Hamano wrote: > Dave Borowitz writes: > >> diff --git a/send-pack.c b/send-pack.c >> index 2a64fec..6ae9f45 100644 >> --- a/send-pack.c >> +++ b/send-pack.c >> @@ -370,7 +370,7 @@ int send_pack(struct send_pack_args *args, >> args->use_thin_p

Re: [PATCH v2 3/8] branch: roll show_detached HEAD into regular ref_list

2015-08-19 Thread Matthieu Moy
Karthik Nayak writes: > + /* > + * First we obtain all regular branch refs and if the HEAD is > + * detached then we insert that ref to the end of the ref_fist > + * so that it can be printed first. > + */ Nit: the end of the sentence reads funny (why put at the end "so t

Re: [PATCH v12 03/13] ref-filter: introduce the ref_formatting_state stack machinery

2015-08-19 Thread Matthieu Moy
Karthik Nayak writes: > +static void pop_state(struct ref_formatting_state **stack) > +{ > + struct ref_formatting_state *current = *stack; > + struct ref_formatting_state *prev = current->prev; > + > + if (prev) > + strbuf_addbuf(&prev->output, ¤t->output); I find this "

Re: [PATCH v12 01/13] ref-filter: move `struct atom_value` to ref-filter.c

2015-08-19 Thread Matthieu Moy
Karthik Nayak writes: > +static void end_atom_handler(struct atom_value *atomv, struct > ref_formatting_state **state) > +{ > + struct ref_formatting_state *current = *state; > + if (!current->at_end) > + die(_("format: `end` atom used without a supporting atom")); You error

Re: [PATCH v12 10/13] tag.c: use 'ref-filter' data structures

2015-08-19 Thread Matthieu Moy
Karthik Nayak writes: > This is a temporary step before porting 'tag.c' to use 'ref-filter' > completely. As this is a temporary step, most of the code > introduced here will be removed when 'tag.c' is ported over to use > 'ref-filter' APIs If you resend: missing '.' at the end of sentence. > -

Re: [PATCH v12 12/13] tag.c: implement '--format' option

2015-08-19 Thread Matthieu Moy
Karthik Nayak writes: > --- a/Documentation/git-tag.txt > +++ b/Documentation/git-tag.txt > @@ -158,6 +159,18 @@ This option is only applicable when listing tags without > annotation lines. > The object that the new tag will refer to, usually a commit. > Defaults to HEAD. > > +:: >

Re: No dialog box appears

2015-08-19 Thread Johannes Schindelin
Hi Aleksey, On 2015-08-19 09:33, Цапков Алексей wrote: > When installing the Git is not a dialog box appears with a choice ssh. > What could be the reason? I assume that you are referring to the Git for Windows installer (please state such details in the future). And I assume you were wondering

[PATCH v4 3/3] untracked cache: fix entry invalidation

2015-08-19 Thread Nguyễn Thái Ngọc Duy
First, the current code in untracked_cache_invalidate_path() is wrong because it can only handle paths "a" or "a/b", not "a/b/c" because lookup_untracked() only looks for entries directly under the given directory. In the last case, it will look for the entry "b/c" in directory "a" instead. This me

[PATCH v4 2/3] untracked-cache: fix subdirectory handling

2015-08-19 Thread Nguyễn Thái Ngọc Duy
From: David Turner Previously, some calls lookup_untracked would pass a full path. But lookup_untracked assumes that the portion of the path up to and including to the untracked_cache_dir has been removed. So lookup_untracked would be looking in the untracked_cache for 'foo' for 'foo/bar' (inst

[PATCH v4 0/3] dt/untracked-subdir

2015-08-19 Thread Nguyễn Thái Ngọc Duy
The first patch is a split from David's v3 patch because it should belong to dt/untracked-sparse. The second is basically David's v3. The third patch fixes untracked_cache_invalidate_path(). David fixed it in v2, but there's another bug in this code. David Turner (1): untracked-cache: fix subdir

[PATCH v4 1/3] t7063: use --force-untracked-cache to speed up a bit

2015-08-19 Thread Nguyễn Thái Ngọc Duy
When in the middle of t7063, we are sure untracked cache is supported, so we can use --force-untracked-cache to skip the support detection phase and save a few seconds. It's also good that --force-untracked-cache is exercised in the test suite. Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t7063-sta

Re: [PATCH v3] untracked-cache: fix subdirectory handling

2015-08-19 Thread Duy Nguyen
On Sun, Aug 16, 2015 at 7:16 PM, Duy Nguyen wrote: > On Sun, Aug 16, 2015 at 12:17 PM, David Turner > wrote: >> Previously, some calls lookup_untracked would pass a full path. But >> lookup_untracked assumes that the portion of the path up to and >> including to the untracked_cache_dir has been

Minor bug with help.autocorrect.

2015-08-19 Thread Bjørnar Snoksrud
If you mis-type a git command starting with a non-letter, git internals will spit out some errors at you. $ git 5fetch error: invalid key: pager.5fetch error: invalid key: alias.5fetch git: '5fetch' is not a git command. See 'git --help'. Did you mean this? fetch $ git \#fetch error: inv

Re: [PATCH] git-am: add am.threeWay config variable

2015-08-19 Thread Matthieu Moy
Paul Tan writes: > On Tue, Aug 18, 2015 at 5:36 PM, Matthieu Moy > wrote: >> I don't remember the details of the regression we had with the shell >> version, but that would probably deserve an additional test to enforce >> the "Hopefully there will be no regressions" part of your message. > > Ac

Re: [PATCH] git-am: add am.threeWay config variable

2015-08-19 Thread Paul Tan
On Tue, Aug 18, 2015 at 5:36 PM, Matthieu Moy wrote: > I don't remember the details of the regression we had with the shell > version, but that would probably deserve an additional test to enforce > the "Hopefully there will be no regressions" part of your message. Actually, technically, I think

[PATCH v2] am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

2015-08-19 Thread Paul Tan
On Mon, Aug 17, 2015 at 12:33:40PM -0700, Junio C Hamano wrote: > Have you checked how this change affects that codepath? To put it > differently, does "am skip" have the same issue without this fix? Hmm, I adopted Dscho's test to run "git am --skip" and it did not fail. I think it's because am_s

No dialog box appears

2015-08-19 Thread Цапков Алексей
Hello. When installing the Git is not a dialog box appears with a choice ssh. What could be the reason? Здравствуйте. При установке гита у меня не появляется диалоговое окно с выбором ssh. Пожалуйста, подскажите в чем может быть причина? -- Shincho itte kudasai. Anime miteru hito! -- To unsubs