Re: "git add -p" versus "git add -i", followed by "p"

the explanation misleading or inncomplete? > > rday > > -- > After selecting 'p', what do you get? You should see a list of modified files. You can select the files you want to stage by the listed numbers. After you selected those files, you press enter, and then you will get the options you'll also see with git add -p. Kevin

Re: Understanding Index Header

xtensions, but the number of index entries. I'm not sure why you are seeing so many index entries. I've just tested it myself on the git repository and I got 3419 entries when reading in network (big-endian) order. Hope this helps a bit. Kevin

Re: Mailsplit

ocal/ -name '*mailsplit*' > /usr/local/share/doc/git-doc/git-mailsplit.txt > /usr/local/share/doc/git-doc/git-mailsplit.html > /usr/local/share/man/man1/git-mailsplit.1 > /usr/local/libexec/git-core/git-mailsplit This is the mailsplit command, and should be executed when running `git mailsplit`. What does git --exec-dir return? Kevin

Re: Adding nested repository with slash adds files instead of gitlink

On Mon, Jun 18, 2018 at 01:19:19PM +0200, Heiko Voigt wrote: Now with cc to the mailing list. > Hi, > > I just discovered that when you have a slash at the end of a nested > repository, the files contained in the repository get added instead of > the gitlink. > > I found this when I was adding

Re: Weird revision walk behaviour

of investigation a long time ago, and I've not looked at it since. Would like input from someone with more active knowledge. Kevin

Re: Weird revision walk behaviour

we matched one, the commit became TREESAME as per the new definition immediately because of the rewrite.  This applies the equivalent rewrite when no relevant parents, consistent with the general concept, and without changing the TREESAME definition. Kevin

Re: Weird revision walk behaviour

yed in each of the other modes for each of those queries... Kevin

Re: Weird revision walk behaviour

On 24/05/2018 23:26, Kevin Bracey wrote: On Wed, May 23, 2018 at 07:10:58PM +0200, SZEDER Gábor wrote:    $ git log --oneline master..ba95710a3b -- ci/    ea44c0a594 Merge branch 'bw/protocol-v2' into jt/partial-clone-proto-v2 In this case, we're hitting a merge commit which

Re: Weird revision walk behaviour

reconcile the simple and full history, for the cases where the simple history takes a weird path because of its love of TREESAME parents, hiding evil merges. But I believe the simple history behaviour was supposed to remain as-is - take first TREESAME always. Kevin

Re: Weird revision walk behaviour

it. It may be that's part of what's happening here. Kevin

Re: BUG: No way to set fsck. when cloning

lemode=ignore=warn (or > =ignore). [0]https://public-inbox.org/git/alpine.deb.2.21.1.1801042125430...@minint-6bku6qn.europe.corp.microsoft.com/ Hope this helps, Kevin.

Re: Git push error due to hooks error

> > Thanks with Regards, > Anjali Barodia Did you remove the hook from the remote repo, or the local repo? Because this is a hook which runs on the repo you are pushing too. Something like pre-receive or pre-update is causing this. Kevin

Re: [PATCH 1/3] checkout.c: add strict usage of -- before file_path

also had a local file/dir called 'pt', which caused git to checkout that file/dir rather than creating a local branch based on the remote branch. Kevin

Re: Git enhancement request - checkout (clone) set modified dates to commit date

On Sun, Apr 22, 2018 at 03:01:10PM -0400, Andrew Wolfe wrote: > Hi Brian, > > Not completely sure what you're saying. If the files on master are > not changed, the changed files' commit timestamps will be older than > the branch commit timestamps. > > However, if I check out master after

Re: "git branch" issue in 2.16.1

On Thu, Feb 08, 2018 at 12:27:07PM +0100, Lars Schneider wrote: > > > On 08 Feb 2018, at 12:13, Lars Schneider wrote: > > > > > >> On 08 Feb 2018, at 09:50, Jeff King wrote: > >> > >> On Wed, Feb 07, 2018 at 11:20:08PM +0100, Lars Schneider wrote: >

Re: [BUG] git remote prune removes local tags, depending on fetch config

On Tue, Jan 16, 2018 at 12:48:32PM +0100, Andreas Schwab wrote: > On Jan 15 2018, Michael Giuffrida wrote: > > > It doesn't seem like a useful feature -- you wouldn't expect `git > > fetch --prune` to remove your local branches that you were developing > > on, right? > >

Re: [PATCH] Add shell completion for git remote rm

On Wed, Jan 17, 2018 at 07:44:19AM +0700, Duy Nguyen wrote: > On Tue, Jan 16, 2018 at 10:57:34AM -0800, Junio C Hamano wrote: > > Duy Nguyen writes: > > > > > On Tue, Jan 16, 2018 at 4:43 AM, Keith Smiley wrote: > > >> So it sounds like either we should

Re: [PATCH] sha1_file: remove static strbuf from sha1_file_name()

On Tue, Jan 16, 2018 at 08:18:14AM +0100, Christian Couder wrote: > Using a static buffer in sha1_file_name() is error prone > and the performance improvements it gives are not needed > in most of the callers. > > So let's get rid of this static buffer and, if necessary > or helpful, let's use

Re: [PATCH] Add shell completion for git remote rm

On Fri, Dec 29, 2017 at 02:01:00AM +, Keith Smiley wrote: > From: Keith Smiley > > Previously git remote rm did not complete your list of removes as remove > does. Your signed-off-by[1] is missing, could you please add that? [1]:

Bug/feature request: Can’t disable fsck warnings during clone

/1879), done. It would be useful to be able to turn off individual warnings during cloning. Is there something I’m missing in the config? Or, is this something that could be fixed? Thanks, Kevin -- Kevin A. Mitchell http://www.kamit.com/

Re: [PATCH] setup.c: move statement under condition

o with that value then? Why does this change improve the situation? These are things you can state in your commit message. Hope this helps, Kevin > > Up until recently, we encouraged dropping the curly brackets from > > single-line statements, but apparently that changed. It is now no lo

Re: [PATCH v2 0/5] SHA1DC fixes & fully moving to a git.git submodule

On Fri, Dec 08, 2017 at 10:29:56PM +, Ævar Arnfjörð Bjarmason wrote: > Here's v2 as promised. Comments per-patch. > > sha1dc: remove in favor of using sha1collisiondetection as a submodule > > Reword & expand commit message. Is this commit missing from the mailing list because the e-mail

Re: [PATCH 3/4] Makefile: use the sha1collisiondetection submodule by default

On Sat, Dec 09, 2017 at 01:30:14PM +0100, Kevin Daudt wrote: > On Tue, Dec 05, 2017 at 02:02:50AM -0500, Jeff King wrote: > > On Tue, Nov 28, 2017 at 09:32:13PM +, Ævar Arnfjörð Bjarmason wrote: > > > > > Change the build process so that instead of needing to supply

Re: [PATCH 3/4] Makefile: use the sha1collisiondetection submodule by default

se projects to get the sha1collisiondetection contents. That's in my opinion a bigger disadvantage of submodules, commands like git archive do not support it, making it harder to get self-contained tarballs. Perpahs there is a good solution to that problem, but then I'd like to hear it. Kevin.

Re: [PATCH 3/3] pull: add config option for verifySignatures

On Sat, Dec 09, 2017 at 09:05:30AM +, Hans Jerry Illikainen wrote: > Verify the signature of the tip commit when `pull.verifySignatures` is > true. This option overrides `merge.verifySignatures` on pull, and can > be disabled with the option `--no-verify-signatures`. Is there a reason why

Re: [PATCH 2/3] t: add tests for pull --verify-signatures

On Sat, Dec 09, 2017 at 09:05:29AM +, Hans Jerry Illikainen wrote: > Add tests for `pull --verify-signatures` with untrusted, bad and no > signatures. Previously the only test for `--verify-signatures` was to > make sure that `pull --rebase --verify-signatures` result in a warning >

Re: [PATCH 1/3] merge: add config option for verifySignatures

nature" mergeoutput && > + git checkout initial > ' > > test_expect_success GPG 'merge commit with bad signature without > verification' ' > - git merge $(cat forged.commit) > + git merge $(cat forged.commit) && > + git checkout initial > +' > + > +test_expect_success GPG 'merge commit with bad signature with > merge.verifySignatures=false' ' > + test_config merge.verifySignatures false && > + git merge $(cat forged.commit) && > + git checkout initial > +' > + > +test_expect_success GPG 'merge commit with bad signature with > merge.verifySignatures=true and --no-verify-signatures' ' > + test_config merge.verifySignatures true && > + git merge --no-verify-signatures $(cat forged.commit) && > + git checkout initial > ' > > test_done Kevin.

Re: [PATCH v2] gitcli: tweak "man gitcli" for clarity

evisions, like this: 'git [...] -- [...]' There might be good reasons why this is, but I don't consider this to be actually ambiguous: there is no branch called 'deleted_file.txt' and git could know that the files exists in the mentioned commit, so it should be pretty clear what is meant. Might be worth documenting this. Kevin

Re: [PATCH v2] gitcli: tweak "man gitcli" for clarity

On Wed, Nov 22, 2017 at 06:19:23AM -0500, Robert P. J. Day wrote: > On Wed, 22 Nov 2017, Junio C Hamano wrote: > > > "Robert P. J. Day" writes: > > > > > git repo with a file called "Gemfile", so i created a branch called > > > "Gemfile", and when i ran: > > > > > > $

Re: [PATCH v2] gitcli: tweak "man gitcli" for clarity

On Tue, Nov 21, 2017 at 04:47:42PM -0500, Robert P. J. Day wrote: > On Tue, 21 Nov 2017, Kevin Daudt wrote: > > > On Tue, Nov 21, 2017 at 04:27:59PM -0500, Robert P. J. Day wrote: > > > No major changes, just some rewording and showing some variations of >

Re: [PATCH v2] gitcli: tweak "man gitcli" for clarity

On Tue, Nov 21, 2017 at 04:27:59PM -0500, Robert P. J. Day wrote: > No major changes, just some rewording and showing some variations of > general Git commands. > > Signed-off-by: Robert P. J. Day > > --- > > diff --git a/Documentation/gitcli.txt

Re: [PATCH] doc: remove explanation of "--" from man pages

users. In the #git irc channel we often have to explain what '--' means and why it's sometimes necessary. I don't however know a better solution to it more clear. Kevin

Re: Git on Mac - Segmentation fault:11

cc: mailinglist On Thu, Nov 16, 2017 at 9:40 PM, Frank Burkitt <fburk...@burkitt.com> wrote: > Kevin - > > Thank you for getting back to me. > > The version of Git is 2.15.0 > I used Brew to install it > I am not getting any segfaults from other apps > When I do a ‘

Re: Git on Mac - Segmentation fault:11

reciated. Hello Frank, Could you provide a bit more information? - What version of git are you using? - how did you install git, - Do you also get segfaults outside of the virtualenv? This sounds perhaps like it's a copattibility issue with a library. Kind regards, Kevin.

Re: [RFC PATCH v3 4/4] builtin/branch: give more useful error messages when renaming

On Mon, Nov 13, 2017 at 08:01:12AM +0530, Kaartic Sivaraam wrote: > On Sunday 12 November 2017 11:53 PM, Kevin Daudt wrote: > > On Thu, Nov 02, 2017 at 12:24:07PM +0530, Kaartic Sivaraam wrote: > > > From: Kaartic Sivaraam <kaarticsivaraam91...@gmail.com> > >

Re: [RFC PATCH v3 4/4] builtin/branch: give more useful error messages when renaming

'm not sure this note adds a lot, since the strbuf API is not that new. Kevin

Re: [PATCH] config: added --expiry-date type support

git config --expiry-date date.valid4 > + } >actual && > + test_cmp expect actual && > + test_must_fail git config --expiry-date date.invalid1 > +' > + > cat > expect << EOF > [quote] > leading = " test" > > -- > https://github.com/git/git/pull/433 Welcome and thanks for your submission. There are a couple of issues, which you can read about in the SubmittingPatches[0] documentation. The first and most foremost is that your signed-off-by is missing, which is a requirement to show that you have the right to submit this code. The commit subject should be in the present tense, as a command to the code base, like so: config: add --expiry-date type support What I'm also missing is a motivation on why you added this option, which should be part of your commit message. As far as I know, there is currently no config setting that expects a date format. Kevin [0]:https://github.com/git/git/blob/master/Documentation/SubmittingPatches

Re: [PATCH] bisect: clarify that one can select multiple good commits

On Sat, Nov 11, 2017 at 08:26:00AM -0500, Robert P. J. Day wrote: > > Current man page for "bisect" is inconsistent explaining the fact that > "git bisect" takes precisely one bad commit, but one or more good > commits, so tweak the man page in a few places to make that clear. > > rday > >

RE: cherry-pick very slow on big repository

renames turned off. Thanks, Kevin > -Original Message- > From: git-ow...@vger.kernel.org [mailto:git-ow...@vger.kernel.org] On Behalf > Of Peter Krefting > Sent: Friday, November 10, 2017 7:05 AM > To: Derrick Stolee <sto...@gmail.com> > Cc: Jeff King <p...@peff.

Re: [PATCH 1/3] notes: move hex_to_bytes() to hex.c and export it

On Sun, Nov 05, 2017 at 05:47:47PM +0100, René Scharfe wrote: > Am 05.11.2017 um 03:56 schrieb Kevin Daudt: > > On Tue, Oct 31, 2017 at 02:46:49PM +0100, René Scharfe wrote: > >> Make the function for converting pairs of hexadecimal digits to binary > >> av

Re: [PATCH 1/3] notes: move hex_to_bytes() to hex.c and export it

` bytes. Return 0 on success, or -1 if Is it correct to call the result binary? I would say that it's the value that gets stored. To me, this value does not really have a base. Kevin

Re: [PATCH v1 1/2] refs: extract function to normalize partial refs

ize_glob_ref starts with a '/' so that future callers will be aware of this contract. Signed-off-by: Kevin Daudt <m...@ikke.info> --- refs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs.c b/refs.c index e9ae659ae..6747981d1 100644 --- a/refs.c +++ b/refs.c @@ -372,6 +372,8 @@ i

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

On Tue, Oct 31, 2017 at 05:33:57PM +0100, Kevin Daudt wrote: > On Tue, Oct 31, 2017 at 10:54:21AM +0100, René Scharfe wrote: > > Reduce code duplication by extracting a function for rewriting an > > existing file. > > > > Signed-off-by: Rene Scharfe <l@web.de&

Re: Is it possible to convert a Json file to xml file with Git

Hello Eyjolfur, git is a version control system, which is mostly content agnostic. It knows nothing about json or xml, let alone how to convert them. You might want to use some kind of programming language to do the conversion. Could you perhaps explain more why you are asking this question? Kevin.

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

On Tue, Oct 31, 2017 at 10:54:21AM +0100, René Scharfe wrote: > Reduce code duplication by extracting a function for rewriting an > existing file. > > Signed-off-by: Rene Scharfe > --- > sequencer.c | 46 +- > 1 file changed, 17

Re: [PATCH 2/2] sequencer: use O_TRUNC to truncate files

On Tue, Oct 31, 2017 at 10:58:16AM +0100, René Scharfe wrote: > Cut off any previous content of the file to be rewritten by passing the > flag O_TRUNC to open(2) instead of calling ftruncate(2) at the end. > That's easier and shorter. > > Signed-off-by: Rene Scharfe > --- >

Re: [PATCH 1/4] remote-mediawiki: add namespace support

ser of Mediawiki or with the Git > bridging, and I don't know what page names look like, but I'm pretty > well convinced from reading both the existing code and this patch that > the changes to get_mw_namespace_id_for_page() are really just a bug > fix to that function. My interpretation is tha

Re: [PATCH 3/3] builtin/describe: describe blobs

but sometimes with corrup repos, git would complain about a certain object missing or corrupt, where it might be usefull to find out how it's referenced. Not sure though if this would work in that case, because the repo is already corrupt. Kevin

Re: [PATCH] cherry-pick: add --keep-existing-origin option

dstr(, > oid_to_hex(>object.oid)); > + strbuf_addstr(, ")\n"); > + } > } > } > > diff --git a/sequencer.h b/sequencer.h > index 6f3d3df82..a907c0947 100644 > --- a/sequencer.h > +++ b/sequencer.h > @@ -24,6 +24,7 @@ struct replay_opts { > int allow_empty; > int allow_empty_message; > int keep_redundant_commits; > + int keep_existing_origin; > int verbose; > > int mainline; > -- > 2.14.1 > I'm wondering if it isn't better to detect that there is already an origin present and not add another one. Or are there situations where you do want multiple cherry-pick origins? Kevin

Re: [PATCH] status: do not get confused by submodules in excluded directories

On Tue, Oct 17, 2017 at 03:10:11PM +0200, Johannes Schindelin wrote: > We meticulously pass the `exclude` flag to the `treat_directory()` > function so that we can indicate that files in it are excluded rather > than untracked when recursing. > > But we did not yet treat submodules the same way.

Re: [PATCH v2] column: show auto columns when pager is active

On Mon, Oct 23, 2017 at 02:52:46PM -0700, Jonathan Nieder wrote: > Hi, > > Kevin Daudt wrote: > > > --- a/column.c > > +++ b/column.c > > @@ -5,6 +5,7 @@ > > #include "parse-options.h" > > #include "run-command.h" > > #

Re: [PATCH v2 1/9] perf/run: add '--config' option to the 'run' script

On Sat, Sep 23, 2017 at 07:55:56PM +, Christian Couder wrote: > It is error prone and tiring to use many long environment > variables to give parameters to the 'run' script. > > Let's make it easy to store some parameters in a config > file and to pass them to the run script. > > The

Re: Multiple paths in GIT_EXEC_PATH

On Tue, Oct 17, 2017 at 06:21:22PM +0300, Nikolay Yakimov wrote: > Hello. After updating to a recent git release (2.14, I believe, but > possibly earlier), setting GIT_EXEC_PATH to multiple directories > stopped working. It did work before, and I believe the culprit is > 'git-sh-setup', which uses

Re: [PATCH] check-ref-format: require a repository for --branch

On Tue, Oct 17, 2017 at 11:40:17AM +0900, Junio C Hamano wrote: > Kevin Daudt <m...@ikke.info> writes: > > >> + setup_git_directory_gently(); > >> + > >> + if (!nongit) > >> + malformed = (strbuf_check_branch_ref(, arg) || > >>

Re: [PATCH] check-ref-format: require a repository for --branch

On Mon, Oct 16, 2017 at 07:45:46PM +0900, Junio C Hamano wrote: > Junio C Hamano writes: > > [..] > > diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c > index 1e5f9835f0..4e62852089 100644 > --- a/builtin/check-ref-format.c > +++

Re: [PATCH v3 00/25] object_id part 10

On Mon, Oct 16, 2017 at 11:49:13PM +, brian m. carlson wrote: > On Mon, Oct 16, 2017 at 11:15:34AM +0900, Junio C Hamano wrote: > > With a hope that this might help other reviewers, here is the > > interdiff between "the previous one merged with v2.15-rc1" and "this > > round applied on

Re: [PATCH v4 03/11] protocol: introduce protocol extension mechanisms

On Mon, Oct 16, 2017 at 10:55:24AM -0700, Brandon Williams wrote: > Create protocol.{c,h} and provide functions which future servers and > clients can use to determine which protocol to use or is being used. > > Also introduce the 'GIT_PROTOCOL' environment variable which will be > used to

[PATCH v2] column: show auto columns when pager is active

and since that was the original motivation for this patch. Helped-by: Rafael Ascensão <rafa.al...@gmail.com> Signed-off-by: Kevin Daudt <m...@ikke.info> --- Changes since v1: - Remove redundant -p flag in tests - Explain why git tag is being tested instead of the more obvious git column column

Re: Can I remove multiple stashed states at a time?

On Fri, Oct 13, 2017 at 01:35:22PM -0400, Jeff King wrote: > On Fri, Oct 13, 2017 at 11:58:12AM +0900, 小川恭史 wrote: > > You can also just do: > > for i in 1 2 3; do > git stash drop $i > done > Doesn't stash 2 become stash 1 after the first drop, and the same for 3, resulting in

Re: [PATCH v2 2/3] for-each-ref: let upstream/push optionally remote ref name

On Thu, Oct 05, 2017 at 02:19:15PM +0200, Johannes Schindelin wrote: > From: J Wyman > [..] > > diff --git a/Documentation/git-for-each-ref.txt > b/Documentation/git-for-each-ref.txt > index 39f50bd53eb..22767025850 100644 > --- a/Documentation/git-for-each-ref.txt > +++

Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign

On Thu, Oct 12, 2017 at 12:44:59PM +0200, Kevin Daudt wrote: > On Thu, Oct 12, 2017 at 02:02:17AM -0700, W. Trevor King wrote: > > Pull has supported these since ea230d8 (pull: add the --gpg-sign > > option, 2014-02-10). Insert in long-option alphabetical order > &g

Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign

On Thu, Oct 12, 2017 at 02:02:17AM -0700, W. Trevor King wrote: > Pull has supported these since ea230d8 (pull: add the --gpg-sign > option, 2014-02-10). Insert in long-option alphabetical order > following 7c85d274 (Documentation/merge-options.txt: order options in > alphabetical groups,

Re: Unable to use --patch with git add

This is a known 'breakage' because people have set color.ui to always (which should not be used anyway). Kind regards, Kevin

Re: [PATCH] column: show auto columns when pager is active

On Wed, Oct 11, 2017 at 08:12:35PM +0200, Martin Ågren wrote: > On 11 October 2017 at 19:23, Kevin Daudt <m...@ikke.info> wrote: > > finalize_colopts in column.c only checks whether the output is a TTY to > > determine if columns should be enabled with columns se

[PATCH] column: show auto columns when pager is active

auto. Also check if the pager is active. Helped-by: Rafael Ascensão <rafa.al...@gmail.com> Signed-off-by: Kevin Daudt <m...@ikke.info> --- column.c | 3 ++- t/t7006-pager.sh | 14 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/column.c b/co

Re: [RFC] column: show auto columns when pager is active

On Tue, Oct 10, 2017 at 07:02:00PM +0200, Martin Ågren wrote: > On 10 October 2017 at 16:01, Jeff King <p...@peff.net> wrote: > > On Tue, Oct 10, 2017 at 12:30:49PM +0200, Martin Ågren wrote: > >> On 9 October 2017 at 23:45, Kevin Daudt <m...@ikke.info> wrote: >

Re: [RFC] column: show auto columns when pager is active

t; --mode=auto <lista" >actual && > > test_cmp expected actual > > ' > > test_done > > Makes sense. FWIW, I don't see the flakyness with this. > > > All that said, I think I'd just as soon test a real command like "git >

[RFC] column: show auto columns when pager is active

t to autol. Also check if the pager is active. Helped-by: Rafael Ascensão <rafa.al...@gmail.com> Signed-off-by: Kevin Daudt <m...@ikke.info> --- This came to light when someone wondered on irc why column.tag=[auto|always] did not work on Mac OS. Testing it myself, I found it to work with alw

Re: "git rm" seems to do recursive removal even without "-r"

So that seems to indicate '*.c' should only match .c files in the current dir. I'm not sure why that's not the case. I hope this clears up what's happening a bit, and perhaps can lead to improvements to the documentation so that it's not so surprising. Kind regards, Kevin.

Re: [bug] git add -p breaks, if color.ui is set to "always"

o with the color codes. Setting it to 'auto' would make more sense. The thread I posted to discusses some changes that might get introduced to improve the situation though. Kevin. [0}:https://public-inbox.org/git/20171003093157.gq7za2fwcqsou...@sigill.intra.peff.net/T/

Re: distinguishing between staged and unstaged content in a stash?

On Wed, Oct 04, 2017 at 07:10:46AM -0400, rpj...@crashcourse.ca wrote: > > couple (admittedly trivial) questions about stashing. first, can i > clarify that when one stashes content, a stash *always* distinguishes > between what was staged, and what was unstaged? that is, when one is >

Re: git add -p stops working when setting color.ui = always

lue to auto should fix it (setting it to always does not make much sense in your config file). Kevin. [0}:https://public-inbox.org/git/20171003093157.gq7za2fwcqsou...@sigill.intra.peff.net/T/

Re: will git rebase has side effect

On Mon, Oct 02, 2017 at 12:06:38AM +0800, Yubin Ruan wrote: > 2017-10-01 22:17 GMT+08:00 Kevin Daudt <m...@ikke.info>: > > Forgot to cc the mailing list. > > > > On Sun, Oct 01, 2017 at 09:23:23PM +0800, Yubin Ruan wrote: > >> Suppose that I have such a history

Re: will git rebase has side effect

you created F', and someone else had pushed F and G. It will reject the push, saying you would need to merge these changes first (but you don't want this, because you are merging the same changes together). To solve this, you can use git push --force-with-lease=master origin, which will force the pus

Re: "man git-checkout", man page is inconsistent between SYNOPSIS and details

on under description explains that mode. Do you feel this distinction needs to be made more clear? Kevin.

Re: '--shallow-since' option is not available for git-pull in Git version 2.14.1

On Mon, Sep 25, 2017 at 04:31:10PM +0900, Sanggyu Nam wrote: > I’ve found that some subcommands such as git-clone, git-fetch, and > git-pull support an option named ‘--shallow-since’, as of Git version > 2.11. This option is documented in the man page of each subcommand. In > Git 2.14.1, I’ve

Re: [PATCH] t2018: remove unwanted empty line

&& > git checkout -B branch1-scratch && > - > setup_dirty_mergeable && > git checkout -B branch1-scratch initial && > test_dirty_mergeable > > -- > https://github.com/git/git/pull/403 Why is this empty line unwanted? This kind of whitespace can help separate logical sections, just like paragraphs would. Kevin.

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Thursday, September 14, 2017 11:00 PM > > Kevin Willford <kewi...@microsoft.com> writes: > > > 1. Does this statement, "I only care about the files in this > > sparse checkout, and do not concern me with a

Re: Git 2.14.1: t6500: error during test on musl libc

On Fri, Sep 15, 2017 at 08:37:40AM +0200, Kevin Daudt wrote: > On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote: > > -BEGIN PGP SIGNED MESSAGE- > > Hash: SHA256 > > > > Hi there, > > > > While bumping Git's version for our Linux distribut

Re: Git 2.14.1: t6500: error during test on musl libc

On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Hi there, > > While bumping Git's version for our Linux distribution to 2.14.1, I've > run in to a new test failure in t6500-gc.sh. This is the output of > the failing test with

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

tc.? 3. What about when there is a merge conflict with a file that is outside the sparse checkout? Should there not be a conflict because git shouldn't be trying to merge the file since it is outside the sparse checkout area? Should the conflicted file get written outside the sparse checkout so the user can resolve it? Thanks, Kevin

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

> From: Jacob Keller [mailto:jacob.kel...@gmail.com] > Sent: Tuesday, September 12, 2017 7:39 PM > > On Tue, Sep 12, 2017 at 4:30 PM, Kevin Willford <kewi...@microsoft.com> wrote: > > > > Sorry. It was not in the sparse-checkout file. > > $ git config co

Re: [PATCH] commit-template: change a message to be more intuitive

On Tue, Sep 12, 2017 at 04:25:36PM +0530, Kaartic Sivaraam wrote: > It's not possible to 'touch' the cut-line that is shown when the > user requests a patch in his commit template. > Touching something can also mean to disturb or change something, which is the meaning being used here, so it is

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

> From: Jacob Keller [mailto:jacob.kel...@gmail.com] > Sent: Tuesday, September 12, 2017 4:29 PM > > On Tue, Sep 12, 2017 at 1:20 PM, Kevin Willford <kewi...@microsoft.com> wrote: > > > > I think this is where I need to do a better job of explaining so here is a >

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

hen my answer to the second question (are we solving the problem > with the right approach?) is no. And at that point, it is moot to > ask if the code correctly and/or efficiently implements that wrong > solution, isn't it? I agree that we must determine if there is a problem, which I hope we can agree that there is a valid problem to be addressed. Determining if I used the right approach depends on how you see reset working correctly using the sparse feature. Should it match a reset when not using sparse or should it reset only sparse files? I saw issues if only the sparse files are the ones reset, which is the reason that I went with this approach. Thanks, Kevin

Re: [PATCH v2 1/2] doc/for-each-ref: consistently use '=' to between argument names and values

On Tue, Sep 12, 2017 at 11:28:00AM +0900, Junio C Hamano wrote: > Kevin Daudt <m...@ikke.info> writes: > > > The synopsis and description inconsistently add a '=' between the > > argument name and it's value. Make this consistent. > > > > Signed

[PATCH v2 2/2] doc/for-each-ref: explicitly specify option names

For count, sort and format, only the argument names were listed under OPTIONS, not the option names. Add the option names to make it clear the options exist Signed-off-by: Kevin Daudt <m...@ikke.info> --- Documentation/git-for-each-ref.txt | 18 +- 1 file changed, 9 inse

[PATCH v2 1/2] doc/for-each-ref: consistently use '=' to between argument names and values

The synopsis and description inconsistently add a '=' between the argument name and it's value. Make this consistent. Signed-off-by: Kevin Daudt <m...@ikke.info> --- Documentation/git-for-each-ref.txt | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff

RE: What's cooking in git.git (Sep 2017, #02; Mon, 11)

t; I didn't submit these patches so what would you like me to do? The reroll for read-cache fix was submitted here https://public-inbox.org/git/20170907192412.8085-1-t.gumme...@gmail.com/ - Kevin

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

> From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Friday, September 8, 2017 9:18 PM > > Kevin Willford <kewi...@microsoft.com> writes: > > > 1. reset mixed when there were files that were added > > > > In this case the index will no longer have

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Friday, September 8, 2017 1:02 PM > Kevin Willford <kewi...@microsoft.com> writes: > > > diff --git a/builtin/reset.c b/builtin/reset.c > > index d72c7d1c96..1b8bb45989 100644 > > --- a/builtin/reset.c > >

RE: [PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Friday, September 8, 2017 1:12 PM > Kevin Willford <kewi...@microsoft.com> writes: > > > When using the sparse checkout feature the git reset command will add > > entries to the index that will have t

[PATCH 0/1] reset: fix mixed reset when using sparse-checkout

the skip-wortree bit so that the file contents before the reset is preserved on disk and status will reports the correct results. Kevin Willford (1): reset: fix reset when using the sparse-checkout feature. builtin/reset.c | 25 + t/t7114-reset-sparse-checkout.sh

[PATCH 1/1] reset: fix reset when using the sparse-checkout feature.

directory and if it will be missing with the new index entry or was not missing in the previous version, we create the previous index version of the file in the working directory so that status will report correctly and the files will be availble for the user to deal with. Signed-off-by: Kevin

[PATCH v3 3/3] merge-recursive: change current file dir string_lists to hashmap

will save some time when there are millions of paths that will be checked. Signed-off-by: Kevin Willford <kewi...@microsoft.com> --- merge-recursive.c | 56 --- merge-recursive.h | 3 +-- 2 files changed, 46 insertions(+), 13 deletions(-) diff

[PATCH v3 2/3] merge-recursive: remove return value from get_files_dirs

if read_tree_recursive gets an error. Since the debug output has been removed and the caller isn't checking the return value there is no reason to keep calculating and returning a value. Signed-off-by: Kevin Willford <kewi...@microsoft.com> --- merge-recursive.c | 8 ++-- 1 file chan

[PATCH v3 0/3] merge-recursive: replace string_list with hashmap

the hashmap and why it is getting initialized and freed but not a local. 3. Use hashmap_get_from_hash and remove the dummy entry Kevin Willford (3): merge-recursive: fix memory leak merge-recursive: remove return value from get_files_dirs merge-recursive: change current file dir string_lists

[PATCH v3 1/3] merge-recursive: fix memory leak

In merge_trees if process_renames or process_entry returns less than zero, the method will just return and not free re_merge, re_head, or entries. This change cleans up the allocated variables before returning to the caller. Signed-off-by: Kevin Willford <kewi...@microsoft.com> ---

[PATCH v2] merge-recursive: change current file dir string_lists to hashmap

will save some time when there are millions of paths that will be checked. Also cleaned up a memory leak and method where the return was not being used. Signed-off-by: Kevin Willford <kewi...@microsoft.com> --- merge-recursive.c | 76 ---

RE: [PATCH] read-cache: fix index corruption with index v4

ere as well which is used in the < version 4 ce_write. > > strbuf_splice(previous_name, common, to_remove, > ce->name + common, ce_namelen(ce) - common); > -- > 2.14.1.480.gb18f417b89 While looking at the code I was wondering if we could get around the whole setting ce->ce_namelen to zero bit but that would be much bigger patch and possibly introduce other bugs so this seems the appropriate fix for now. Thanks for finding this! Kevin

  1   2   3   4   5   >