On Fri, Apr 28, 2017 at 10:44:22AM +0530, Kaartic Sivaraam wrote:
> I guess it would be better to display the help menu in a separate flow, like
> when the user click the `?` option in the `patch` flow then the whole screen
> is cleared and the help menu is displayed in some appropriate place and
Hello My Dear,
This is my second mail but No response,from you Why ?regarding my
Easter Donation Gift"
Reminding notice/ this is to inform you that i am still in the
hospital bed taking a medical treatments because of my Old age
illness.Please i need your urgent answer/ i want to know if you have
Hello community,
I would like to state about a small issue I face when I use the `git add
-i` command. I guess it's expressed easily with an example.
Start
Imagine a situation in which you accidentally made a reasonable amount
of change to your code from your last commit. You would
Ramsay Jones writes:
> Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule
> names", 07-04-2017) added a test which creates a git repository with
> some backslash characters in the name. This test cannot work on windows,
> since the backslash is used as the directory separator
Jeff King writes:
> As we discussed elsewhere, it would be nice if this tested remoteBranch,
> too. IMHO the simplest thing to is to rebase it on the t7508 update I
> just posted.
>
> The other option is to add config for remoteBranch which would do
> nothing for now, and then resolve it to check
Junio C Hamano writes:
> Yes. The "pretty_given" trick is one example that the underlying
> implementation can change over time. If you wrote this patch before
> 66b2ed09 ("Fix "log" family not to be too agressive about showing
> notes", 2010-01-20) happened, you wouldn't have known to flip thi
"Philip Oakley" writes:
>> In the modern day, it might be useful if the "--working-tree-only"
>> mode added a new file as an intent-to-add entry to the index, but
>> that is not what "git apply (no other options)" (which is the gold
>
> did you mean `git add` ? Or am I missing something.
I did m
Commit cf9e55f494 ("submodule: prevent backslash expantion in submodule
names", 07-04-2017) added a test which creates a git repository with
some backslash characters in the name. This test cannot work on windows,
since the backslash is used as the directory separator. In order to
suppress this te
On Fri, Apr 28, 2017 at 12:17:54AM +, brian m. carlson wrote:
> > What's the gain in converting it here? I know we want to get rid of the
> > bare "20", but we could switch it out for GIT_SHA1_RAWSZ. I suspect you
> > prefer in the long run to get rid of even those GIT_SHA1_RAWSZ defines,
> >
On Thu, Apr 27, 2017 at 01:52:09AM -0400, Jeff King wrote:
> On Sun, Apr 23, 2017 at 09:34:35PM +, brian m. carlson wrote:
> > Use a
> > struct object_id to hold the pack checksum, even though it is not
> > strictly an object ID. Doing so ensures resilience against future hash
> > size changes
Johannes Schindelin writes:
>> > + out = fopen(todo_file, "w");
>>
>> The usual "open lockfile, write to it and then rename" dance is not
>> necessary for the purpose of preventing other people from reading
>> this file while we are writing to it. But if we fail inside this
>> function before
Johannes Schindelin writes:
> Hi Junio,
>
> On Wed, 26 Apr 2017, Junio C Hamano wrote:
>
>> Johannes Schindelin writes:
>>
>> > diff --git a/sequencer.c b/sequencer.c
>> > index 77afecaebf0..e858a976279 100644
>> > --- a/sequencer.c
>> > +++ b/sequencer.c
>> > @@ -2388,3 +2388,48 @@ void append
Getting the following error for a submodule when using git/ssh:
$ git clone --recursive ssh://incense:/home/erik/git/nacl.git
Cloning into 'nacl'...
remote: Counting objects: 32, done.
remote: Compressing objects: 100% (25/25), done.
remote: Total 32 (delta 5), reused 0 (delta 0)
Receiving objects
Hi Hannes,
On Thu, 27 Apr 2017, Johannes Sixt wrote:
> Am 26.04.2017 um 22:20 schrieb Johannes Schindelin:
> > Reported by Coverity.
> >
> > Signed-off-by: Johannes Schindelin
> > ---
> > setup.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/setup.c b/setup.c
>
Hi Stefan,
On Wed, 26 Apr 2017, Stefan Beller wrote:
> On Wed, Apr 26, 2017 at 1:20 PM, Johannes Schindelin
> wrote:
> > Reported by Coverity.
> >
> > Signed-off-by: Johannes Schindelin
> > ---
> > setup.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/setup.c b
From: "Jeff King" Sent: Tuesday, April 25, 2017 4:22 AM
Just catching up - sorry it's late..
On Mon, Apr 24, 2017 at 04:43:28PM -0700, Stefan Beller wrote:
>> On the main list thare is a similar "issue" [1] regarding the
>> expectation for `git checkout`,
>> and importantly (for me) these col
Hi Stefan,
On Wed, 26 Apr 2017, Stefan Beller wrote:
> On Wed, Apr 26, 2017 at 1:19 PM, Johannes Schindelin
> wrote:
> > I recently registered the git-for-windows fork with Coverity to ensure
> > that even the Windows-specific patches get some static analysis love.
>
> YAY! How do you trigger t
On 04/26, Ævar Arnfjörð Bjarmason wrote:
> This is an expansion of the previously solo 02/05 "clone: add a
> --no-tags option to clone without tags" patch (see
> <20170418191553.15464-1-ava...@gmail.com>).
>
> This addresses the comments by Junio & Jonathan Nieder on v2 (thanks a
> lot), and in ad
On 04/27, Stefan Beller wrote:
> On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason
> wrote:
> > From: Brandon Williams
> >
> > Add a --no-tags-submodules which does for --no-tags what the existing
> > --shallow-submodules does for --depth, i.e. doing:
> >
> > git clone --recurse-submod
On 04/27, Stefan Beller wrote:
> On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason
> wrote:
> > Rename the t5614-clone-submodules.sh test to
> > t5614-clone-submodules-shallow.sh. It's not a general test of
> > submodules, but of shallow cloning in relation to submodules. Move it
> > to cre
On 04/27, Stefan Beller wrote:
> I like the option, though I dislike the implementation, specifically as you
> brought up e.g. "[PATCH] various: disallow --no-no-OPT for --no-opt options".
>
> Can we have an option "--tags" instead, which is on by default
> and then you can negate it to --no-tags,
From: "Junio C Hamano" Sent: Wednesday, April 26, 2017
3:51 AM
"Philip Oakley" writes:
As I recall Christoph was using checkout to copy a file (e.g. a
template file) from an older commit/revision into his worktree, and
was suprised that this (git checkout ) also _staged_ the
file, rather tha
Hi Junio,
On Wed, 26 Apr 2017, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > These tests were a bit anal about the *exact* warning/error message
> > printed by git rebase. But those messages are intended for the *end
> > user*, therefore it does not make sense to test so rigidly for
On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson
wrote:
> Make parse_object, parse_object_or_die, and parse_object_buffer take a
> pointer to struct object_id. Remove the temporary variables inserted
> earlier, since they are no longer necessary. Transform all of the
> callers using the followi
Hi Junio,
On Wed, 26 Apr 2017, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index 214af0372ba..52a19e0bdb3 100644
> > --- a/git-rebase--interactive.sh
> > +++ b/git-rebase--interactive.sh
> > @@ -774,11 +774,1
picking up this old topic,
with Martin, Marc and SZEDER cc'd,
as we got patch proposals regarding the indent heuristic.
On Sat, Dec 24, 2016 at 4:55 AM, Michael Haggerty wrote:
> On 12/23/2016 10:17 PM, Junio C Hamano wrote:
>> Junio C Hamano writes:
>>
>>> I guess both you and Michael are in fa
So here's my attempt at fixing this.
The thing I was missing is that init_revisions() calls diff_setup(), which
sets the xdl options. It's therefore necessary to have the
diff_indent_heuristic flag set before calling init_revisions().
A naive way to get the indentHeuristic config option respecte
This makes the commands respect diff configuration options, such as
indentHeuristic.
Signed-off-by: Marc Branchaud
---
builtin/diff-files.c | 2 +-
builtin/diff-index.c | 2 +-
builtin/diff-tree.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/diff-files.c b/buil
Signed-off-by: Marc Branchaud
---
diff.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 11eef1c85..da96577ea 100644
--- a/diff.c
+++ b/diff.c
@@ -290,9 +290,6 @@ int git_diff_ui_config(const char *var, const char *value,
void *cb)
> The patch adds BASH completion for a newly added option.
There is a '--no-indent-heuristic' option, too, and a
'diff.indentHeuristic' config variable as well.
I'm not sure it's worth it, though. As far as I remember the future
plans for indent heuristics, this option and config variable are o
On Thu, Apr 27, 2017 at 04:09:56PM -0400, Jeff King wrote:
> On Thu, Apr 27, 2017 at 12:36:54PM -0400, Robert Stryker wrote:
>
> > The problem: the script takes 30 minutes for one environment
> > including git 2.7.4, and generates a repo of about 30mb. When run by
> > a coworker using git 2.9.
Am 27.04.2017 um 04:54 schrieb Junio C Hamano:
> * rs/large-zip (2017-04-24) 5 commits
>(merged to 'next' on 2017-04-26 at a6beab60f2)
> + archive-zip: support files bigger than 4GB
> + archive-zip: support archives bigger than 4GB
> + archive-zip: write ZIP dir entry directly to strbuf
>
On Thu, Apr 27, 2017 at 02:37:19PM -0400, Andrew Watson wrote:
> I'm trying to setup git with Smart HTTP so we can move off of SVN.
>
> I've used the blog post: https://git-scm.com/blog/2010/03/04/smart-http.html
I'm not sure how that post will have aged. You might check your setup
against the d
On Thu, Apr 27, 2017 at 12:36:54PM -0400, Robert Stryker wrote:
> The problem: the script takes 30 minutes for one environment
> including git 2.7.4, and generates a repo of about 30mb. When run by
> a coworker using git 2.9.3, it takes 22+ hours and generates a 10gb
> repo.
>
> Clearly someth
Am 27.04.2017 um 06:57 schrieb Peter Krefting:
> René Scharfe:
>> Windows XP. Don't laugh. ;)
>
> You can always install 7-zip or something to extract on XP.
Sure, but if we were to start emitting zip64 records regardless of the
size of entries then we'd break compatibility. We should have a ver
On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason
wrote:
> @@ -855,7 +856,7 @@ static int prepare_to_clone_next_submodule(const struct
> cache_entry *ce,
> argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
> if (suc->recommend_shallow && sub->recommend
Hi,
I'm trying to setup git with Smart HTTP so we can move off of SVN.
I've used the blog post: https://git-scm.com/blog/2010/03/04/smart-http.html
I'm getting "error: Cannot access URL ... return code 22" when I try
to push. Clone works fine.
I verified authentication by replacing my LDAP stuf
On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason
wrote:
> From: Brandon Williams
>
> Add a --no-tags-submodules which does for --no-tags what the existing
> --shallow-submodules does for --depth, i.e. doing:
>
> git clone --recurse-submodules --no-tags --no-tags-submodules
>
> Will c
On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason
wrote:
> Rename the t5614-clone-submodules.sh test to
> t5614-clone-submodules-shallow.sh. It's not a general test of
> submodules, but of shallow cloning in relation to submodules. Move it
> to create another similar t56*-clone-submodules-*
On Wed, Apr 26, 2017 at 4:12 PM, Ævar Arnfjörð Bjarmason
wrote:
> Add a --no-tags option to clone without fetching any tags.
>
> Without this change there's no easy way to clone a repository without
> also fetching its tags.
>
> When supplying --single-branch the primary remote branch will be
> cl
Am 27.04.2017 um 11:14 schrieb Duy Nguyen:
On Thu, Apr 27, 2017 at 12:07 PM, Johannes Sixt wrote:
Am 27.04.2017 um 02:57 schrieb Junio C Hamano:
Johannes Sixt writes:
+++ git ls-remote 'refs*master'
+warning: unable to access '.git/branches/refs*master': Invalid argument
fatal: 'refs*mast
Am 26.04.2017 um 22:19 schrieb Johannes Schindelin:
I recently registered the git-for-windows fork with Coverity to ensure
that even the Windows-specific patches get some static analysis love.
While at it, I squashed a couple of obvious issues in the part that is
not Windows-specific.
Thanks f
Am 26.04.2017 um 22:21 schrieb Johannes Schindelin:
We free()d the `log` buffer when dwim_log() returned 1, but not when it
returned a larger value (which meant that it still allocated the buffer
but we simply ignored it).
Identified by Coverity.
Signed-off-by: Johannes Schindelin
---
reflog-
--
Did you receive my email, reply via ( chenginsh...@gmail.com ) for further
details.
Am 26.04.2017 um 22:21 schrieb Johannes Schindelin:
Discovered by Coverity.
Signed-off-by: Johannes Schindelin
---
line-log.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/line-log.c b/line-log.c
index a23b910471b..19d46e9ea2c 100644
--- a/line-log.c
+++ b/line-log.c
@@ -1125,6 +1125,7 @
On 4/26/2017 11:13 PM, Jeff King wrote:
On Wed, Apr 26, 2017 at 10:05:23PM +0200, Johannes Schindelin wrote:
From: Jeff Hostetler
Teach do_write_index() to close the index.lock file
before getting the mtime and updating the istate.timestamp
fields.
On Windows, a file's mtime is not updated
On 4/26/2017 11:21 PM, Junio C Hamano wrote:
Johannes Schindelin writes:
From: Jeff Hostetler
Teach do_write_index() to close the index.lock file
before getting the mtime and updating the istate.timestamp
fields.
On Windows, a file's mtime is not updated until the file is
closed. On Linu
Am 26.04.2017 um 22:21 schrieb Johannes Schindelin:
Reported by, you guessed it, Coverity.
Signed-off-by: Johannes Schindelin
---
builtin/fast-export.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index e0220630d00..828d41c0c11 100644
--- a/
On Thu, Apr 27, 2017 at 2:09 AM, Martin Liška wrote:
> On 04/26/2017 09:38 PM, Stefan Beller wrote:
>> On Tue, Apr 25, 2017 at 4:37 AM, Martin Liška wrote:
>>> Hello.
>>>
>>> The patch adds BASH completion for a newly added option.
>>>
>>
>> The looks good, though the format is unusual. (We prefe
Hi all:
The following script attempts to merge 4 git repos into one,
maintaining tag and branch content (but not SHAs). Each original repo
basically gets its own subfolder in the new one. Original repos are
first rewritten to have their history think they always belonged in
the target subfolder.
On 04/26, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > From: Brandon Williams
> >
> > Add a --no-tags-submodules which does for --no-tags what the existing
> > --shallow-submodules does for --depth, i.e. doing:
> >
> > git clone --recurse-submodules --no-tags --no-tags-subm
Hi Junio,
On Wed, 26 Apr 2017, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > diff --git a/sequencer.c b/sequencer.c
> > index 77afecaebf0..e858a976279 100644
> > --- a/sequencer.c
> > +++ b/sequencer.c
> > @@ -2388,3 +2388,48 @@ void append_signoff(struct strbuf *msgbuf, int
> > ig
+ Pat
On Thu, 27 Apr 2017, Sebastian Schuberth wrote:
> + Pat
>
> On 2017-04-27 08:38, Sebastian Schuberth wrote:
>
> > git-gui--askpass is not only used for SSH authentication, but also for
> > HTTPS. In that context it is confusing to only rfer to "OpenSSH", also
> > because another SSH clie
Hi Steve,
On Wed, 26 Apr 2017, Steve Hicks wrote:
> On Wed, Apr 26, 2017 at 12:17 PM, Johannes Schindelin
> wrote:
> > From: Stephen Hicks
> >
> > In the scripted version of the interactive rebase, there was no
> > internal representation of the todo list; it was re-read before every
> > comman
On Tue, Apr 25, 2017 at 05:39:16PM -0600, Daniel Wallace wrote:
> I am not sure if this is a regression or not, but I wanted to get feedback.
>
> It looks like this commit changed some behavior in git-http-backend
>
> https://git.kernel.org/pub/scm/git/git.git/commit/?id=6bc0cb5176a5e42ca4a74e35
+ Pat
On 2017-04-27 08:38, Sebastian Schuberth wrote:
git-gui--askpass is not only used for SSH authentication, but also for
HTTPS. In that context it is confusing to only rfer to "OpenSSH", also
because another SSH client like PuTTY might be in use. So generalize
wording and also say which par
On Thu, Apr 27, 2017 at 12:07 PM, Johannes Sixt wrote:
> Am 27.04.2017 um 02:57 schrieb Junio C Hamano:
>>
>> Johannes Sixt writes:
>>
>>> +++ git ls-remote 'refs*master'
>>> +warning: unable to access '.git/branches/refs*master': Invalid argument
>>> fatal: 'refs*master' does not appear to be a
On 04/26/2017 09:38 PM, Stefan Beller wrote:
> On Tue, Apr 25, 2017 at 4:37 AM, Martin Liška wrote:
>> Hello.
>>
>> The patch adds BASH completion for a newly added option.
>>
>
> The looks good, though the format is unusual. (We prefer the
> format to be inline instead of an attachment)
Good, a
On Fri, Apr 21, 2017 at 10:42:02PM -0700, Stephen Kent wrote:
> Add color config slots to be used in the status short-format when
> displaying local and remote tracking branch information.
>
> Signed-off-by: Stephen Kent
This looks good to me, and I'd be happy if we took it as-is.
But...
> di
When git-status shows tracking data for the current branch
in the long format, we try to end the stanza with a blank
line. When status.displayCommentPrefix is true, we call
color_fprintf_ln() to do so. But when it's false, we call
the enigmatic:
fputs("", s->fp);
which does nothing at all! This
On Fri, Apr 21, 2017 at 10:40:30PM -0700, Stephen Kent wrote:
> I've updated the commit message and updated one of the existing unit tests
> for this feature. Patch version 2 will follow shortly after this email.
Thanks, and sorry for the slow reply.
> There is an existing color slot "color.stat
Hello, my name is Nikita (male).
Could you explain this (subject) is a bug or a feature?
I follow Pro Git Reordering Commits
(https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History) to reorder commits
and lose one without any conflict.
I've got git under Windows 10 Enterprise 64-bit instal
62 matches
Mail list logo
