Re: [Feature Request] Option to make .git not read-only in cloned repos

2019-08-25 Thread Kevin Daudt
On Fri, Aug 23, 2019 at 10:43:45PM +0200, Albert Vaca Cintora wrote: > Hi git folks, > > Honestly I'm not aware of the reason behind .git being read-only, but > I'm sure there is one. > > However, I'm sure that a large percentage of developers out there will > agree with me that having to use for

Re: your mail

2019-07-11 Thread Kevin Daudt
On Thu, Jul 11, 2019 at 03:11:33PM -0500, Robert Morgan wrote: > subscribe git You need to send this to majord...@vger.kernel.org. Sending it to the git mailing list will not do a lot. Kevin

Re: Why is part of push origin output written to stderr?

2019-06-25 Thread Kevin Daudt
On Tue, Jun 25, 2019 at 08:27:20AM -0700, Thomas Hruska wrote: > As seen from a basic 'git push origin master' where the last part of the > output of a successful push origin is sent to stderr instead of stdout: > > To host:user/something.git >1f57f4a..1a96eab master -> master > > I don't us

Re: Unable to change remote url of origin

2019-03-27 Thread Kevin Daudt
On Wed, Mar 27, 2019 at 01:25:27PM +0100, Petr Bena wrote: > Hello, > > I used to change remote URL simply by editing .git/config (which may not be > most correct way), but out of sudden I am no longer able to do that. So I > decided to do it the "proper way" but still - to no avail. Here is what

Re: why does "git revert" commit even if i try to bail with ":q!"?

2019-03-12 Thread Kevin Daudt
On Tue, Mar 12, 2019 at 01:22:51PM -0400, Robert P. J. Day wrote: > > never noticed this before ... when i do a regular "git commit" and > enter my "vi" edit session and change my mind, i can bail with ":q!", > regardless of what i've set up as a commit message, and i'll see: > > Aborting com

Re: git MUST notify user when files will be deleted or overwritten by command

2019-03-09 Thread Kevin Daudt
On Sat, Mar 09, 2019 at 10:19:03AM +, Dimitri Joukoff wrote: > Hi, > > As a relatively novice user of git, there have been far too many times > that I have lost data, sometimes quite a lot. So this proposal is about > catering for the less experienced users and averting fits of anger and > fr

Re: [PATCH v3] utf8: handle systems that don't write BOM for UTF-16

2019-02-11 Thread Kevin Daudt
On Mon, Feb 11, 2019 at 01:26:39AM +, brian m. carlson wrote: > When serializing UTF-16 (and UTF-32), there are three possible ways to > write the stream. One can write the data with a BOM in either big-endian > or little-endian format, or one can write the data without a BOM in > big-endian fo

[PATCH] t0028: fix wrong octal values for BOM in setup

2019-02-11 Thread Kevin Daudt
#x27;, resulting in an invalid BOM. Fix this by using the proper value of 0xff: '\377'. Signed-off-by: Kevin Daudt --- I do wonder why this code is using octal values in the first place, rather than using hex values. t/t0028-working-tree-encoding.sh | 8 1 file changed, 4 i

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-09 Thread Kevin Daudt
On Fri, Feb 08, 2019 at 08:42:19PM +, brian m. carlson wrote: > On Fri, Feb 08, 2019 at 09:23:36PM +0100, Kevin Daudt wrote: > > Firstly, the tests expect iconv -t UTF-16 to output a BOM, which it > > indeed does not do on Alpine. Secondly, git itself also expects the BOM &g

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread Kevin Daudt
On Fri, Feb 08, 2019 at 09:50:07AM -0800, Junio C Hamano wrote: > "brian m. carlson" writes: > > >> So would you suggest that we just skip this test on Alpine Linux? > > > > That's not exactly what I said. If Alpine Linux users are never going to > > use this functionality and don't care that it'

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-08 Thread Kevin Daudt
On Fri, Feb 08, 2019 at 11:45:02AM +, brian m. carlson wrote: > On Fri, Feb 08, 2019 at 01:04:03AM -0500, Rich Felker wrote: > [..] > > In any case, this test seems mainly relevant to Windows users wanting > > to store source files in UTF-16LE with BOM. This doesn't really make > > sense to do

t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

2019-02-07 Thread Kevin Daudt
I'm trying to get the git test suite passing on Alpine Linux, which is based on musl libc. All tests in t0028-working-tree-encoding.sh are currently failing, because musl iconv does not support statefull output of UTF-16/32 (eg, it does not output a BOM), while git is expecting that to be present:

Re: Git checkout multiple options issue

2019-01-28 Thread Kevin Daudt
On Mon, Jan 28, 2019 at 10:20:02AM -0500, Randall S. Becker wrote: > On January 28, 2019 9:25, COLLOMB Joris wrote: > > -Message d'origine- > >> De : Randall S. Becker Envoyé : lundi 28 janvier > >> 2019 15:12 À : COLLOMB Joris -EXT ; > >> git@vger.kernel.org Objet : RE: Git checkout multi

Re: your mail

2019-01-25 Thread Kevin Daudt
On Fri, Jan 25, 2019 at 12:47:35PM +0300, Furkan DURUL wrote: > Hello, > My name is Furkan. I'm a new graduated Electronics and Communication > Engineer in Turkey. In my current workplace, we use Git in all our > projects and I really learned a lot from your Pro Git Book. I would > like to contribu

Re: How do I get rid of unneeded objects?

2019-01-18 Thread Kevin Daudt
On Fri, Jan 18, 2019 at 10:40:55PM +, Eric Wong wrote: > Steve Keller wrote: > > $ git reflog expire --all > > I've never used "git reflog" directly, but I think you need to > add "--expire=all" to cover all time. "--all" is only for all > branches, so you need "--expire=" is for a time

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

2018-12-02 Thread Kevin Daudt
On Sun, Dec 02, 2018 at 11:30:19AM -0500, Robert P. J. Day wrote: > > testing adding by patch for the very first time (i've just never > needed this), and reading the "progit" book and reading the man page, > and the impression i'm getting is that running "git add -p" (going > straight to patch

Re: Understanding Index Header

2018-10-06 Thread Kevin Daudt
On Sat, Oct 06, 2018 at 05:13:45PM -0400, Farhan Khan wrote: > Hi all, > > I am writing a program that parses out the .git/index file. I am > reading the git index header documentation, but I seem to be getting > jibberish data. > https://github.com/git/git/blob/master/Documentation/technical/inde

Re: Mailsplit

2018-09-07 Thread Kevin Daudt
On Wed, Sep 05, 2018 at 09:17:29PM -0700, Stephen & Linda Smith wrote: > I thought I would use "git mailsplit" to split a mbox file (which downloaded > from public inbox) so that I could attemp to resurrect a patch series for > from > a year ago. > > The motivation is that I downloaded the se

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

2018-06-19 Thread Kevin Daudt
On Tue, Jun 19, 2018 at 11:29:02PM +0100, Rafael Ascensão wrote: > On Tue, Jun 19, 2018 at 11:28 AM Heiko Voigt wrote: > > > > Interesting and nobody complained to the mailinglist? > > > > For reference this was sometimes called "Fake Submodules" online. Do you refer to cloning a repository in a

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

2018-06-18 Thread Kevin Daudt
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: BUG: No way to set fsck. when cloning

2018-05-24 Thread Kevin Daudt
On Thu, May 24, 2018 at 05:25:29PM +0200, Ævar Arnfjörð Bjarmason wrote: > When I do: > > git -c fetch.fsckObjects=true clone > g...@github.com:robbyrussell/oh-my-zsh.git > > I get: > > error: object 2b7227859263b6aabcc28355b0b994995b7148b6: > zeroPaddedFilemode: contains zero-padded f

Re: Git push error due to hooks error

2018-05-14 Thread Kevin Daudt
On Mon, May 14, 2018 at 05:44:06PM +, Barodia, Anjali (Nokia - IN/Noida) wrote: > Hi Support, > > > I was trying to push local git to another git on gerrit, but stuck with an > hook error. > This is a very large repo and while running the command "git push origin > --all" > I am getting th

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

2018-05-13 Thread Kevin Daudt
On Sat, May 12, 2018 at 08:23:32PM -0600, Dannier Castro L wrote: > Currently, is a complex command able to handle both > branches and files without any distintion other than their names, > taking into account that depending on the type (branch or file), > the functionality is completely different

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

2018-04-22 Thread Kevin Daudt
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 committ

Re: "git branch" issue in 2.16.1

2018-02-08 Thread Kevin Daudt
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: > >> > 1. You have $LESS in your enviro

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

2018-01-17 Thread Kevin Daudt
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? > > Don't mix local and remo

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

2018-01-16 Thread Kevin Daudt
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 deprecate rm, or I should update the > >

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

2018-01-16 Thread Kevin Daudt
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 one

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

2017-12-28 Thread Kevin Daudt
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]: https://github.com/git/git/blob/master/Documentation/Submitti

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

2017-12-24 Thread Kevin Daudt
On Sun, Dec 24, 2017 at 12:15:35PM +0400, Vadim Petrov wrote: > Thank you for your replay. > > > I have to be honest: this commit message (including the subject) left me > > quite puzzled as to the intent of this patch. > > I still only learn English and correctly express my thoughts while somewh

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

2017-12-09 Thread Kevin Daudt
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 i

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

2017-12-09 Thread Kevin Daudt
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

2017-12-09 Thread Kevin Daudt
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 > > DC_SHA1_SUBMODULE=YesPlease to use the sha1collisiondetection > > submodule instead of the c

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

2017-12-09 Thread Kevin Daudt
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 git

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

2017-12-09 Thread Kevin Daudt
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 > (t5520-pul

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

2017-12-09 Thread Kevin Daudt
Hello Hans Jerry, Thank you for your contribution. I have soem remarks below. On Sat, Dec 09, 2017 at 09:05:28AM +, Hans Jerry Illikainen wrote: > Verify the signature of the tip commit when `merge.verifySignatures` is > true. This can be overridden with `--no-verify-signatures`. > > Signed

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

2017-11-23 Thread Kevin Daudt
On Thu, Nov 23, 2017 at 08:51:55AM -0500, Jeff King wrote: > On Thu, Nov 23, 2017 at 02:45:44AM -0500, Robert P. J. Day wrote: > > > > It's pretty clear to me as it is, but maybe we can write it differently. > > > Like: > > > > > > Without a disambiguating `--`, Git makes a reasonable guess. If

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

2017-11-22 Thread Kevin Daudt
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: > > > > > > $ git checkout Gemfile > > >

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

2017-11-21 Thread Kevin Daudt
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

2017-11-21 Thread Kevin Daudt
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 b/Documentation/gitcli.txt > index 9f13266a6..d6

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

2017-11-21 Thread Kevin Daudt
On Tue, Nov 21, 2017 at 04:12:02PM -0500, Robert P. J. Day wrote: > "man gitcli" already explains the purpose of the "--" syntax, so there > is no value to a small subset of Git commands explaining that in their > man pages. > > Signed-off-by: Robert P. J. Day > > --- > > i tried this once be

Re: Git on Mac - Segmentation fault:11

2017-11-16 Thread Kevin Daudt
On Wed, Nov 15, 2017 at 05:30:23PM -0700, Frank Burkitt wrote: > I am using Git on a Macbook pro with MacOS High Sierra version 10.13.1 > (17B48). I have been using it in a virtualenv with python 3. I have > begun to get "Segmentation fault: 11" with every git command. I have > been searching fo

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

2017-11-13 Thread Kevin Daudt
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 > > > > > > When trying to rename an

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

2017-11-12 Thread Kevin Daudt
On Thu, Nov 02, 2017 at 12:24:07PM +0530, Kaartic Sivaraam wrote: > From: Kaartic Sivaraam > > When trying to rename an inexistent branch to with a name of a branch This sentence does not read well. Probably s/with a/the/ helps. > that already exists the rename failed specifying the new branch

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

2017-11-12 Thread Kevin Daudt
On Sun, Nov 12, 2017 at 12:19:35PM +, Haaris wrote: > --- > builtin/config.c | 11 ++- > config.c | 9 + > config.h | 1 + > t/t1300-repo-config.sh | 25 + > 4 files changed, 45 insertions(+), 1 deletion(-) > > diff -

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

2017-11-11 Thread Kevin Daudt
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 > > Signe

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

2017-11-05 Thread Kevin Daudt
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

2017-11-04 Thread 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 > available to other call sites. > > Signed-off-by: Rene Scharfe > --- > cache.h | 7 +++ > hex.c | 12 > notes.c | 17 - > 3

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

2017-11-04 Thread Kevin Daudt
it as a BUG when the prefix argument of normalize_glob_ref starts with a '/' so that future callers will be aware of this contract. Signed-off-by: Kevin Daudt --- refs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs.c b/refs.c index e9ae659ae..6747981d1 100644 --- a/refs.c +

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

2017-10-31 Thread Kevin Daudt
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 &g

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

2017-10-31 Thread Kevin Daudt
On Tue, Oct 31, 2017 at 05:28:40PM +, Eyjolfur Eyjolfsson wrote: > Hi > > I have a question. > Is it possible to convert a Json file to XML with Git > > Best regards > > Eyjolfur Eyjolfsson > > (e) eyjolfureyjolfs...@tprg.com > (w) tpretailgroup.com > Hello Eyjolfur, git is a version con

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

2017-10-31 Thread Kevin Daudt
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 insertions(+), 29 delet

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

2017-10-31 Thread Kevin Daudt
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 > --- > sequencer.c | 4 +---

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

2017-10-29 Thread Kevin Daudt
On Sat, Oct 28, 2017 at 08:28:54PM -0700, Stefan Beller wrote: > On Sat, Oct 28, 2017 at 10:32 AM, Johannes Schindelin > wrote: > > > > [..] > > I wonder whether it would make sense to extend this to tree objects while > > we are at it, but maybe that's an easy up-for-grabs. > > I can look into

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

2017-10-28 Thread Kevin Daudt
On Sat, Oct 28, 2017 at 08:04:40PM +0800, Anthony Wong wrote: > When cherry-picking from a commit whose commit message already > contains the "(cherry picked from commit ...)" line, this option will > not add another one. This is useful when you are cherry-picking from a > bunch of commits, some ar

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

2017-10-24 Thread Kevin Daudt
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

2017-10-23 Thread Kevin Daudt
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

2017-10-18 Thread Kevin Daudt
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 GIT_PERF

Re: Multiple paths in GIT_EXEC_PATH

2017-10-17 Thread Kevin Daudt
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

2017-10-16 Thread Kevin Daudt
On Tue, Oct 17, 2017 at 11:40:17AM +0900, Junio C Hamano wrote: > Kevin Daudt writes: > > >> + setup_git_directory_gently(&nongit); > >> + > >> + if (!nongit) > >> + malformed = (strbuf_check_branch_ref(&sb, arg) || > >&g

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

2017-10-16 Thread Kevin Daudt
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 > +++ b/builtin/check-ref-format.c > @@ -38,12 +38,2

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

2017-10-16 Thread Kevin Daudt
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 v2.15-r

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

2017-10-16 Thread Kevin Daudt
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 communi

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

2017-10-16 Thread Kevin Daudt
ce that was the original motivation for this patch. Helped-by: Rafael Ascensão Signed-off-by: Kevin Daudt --- Changes since v1: - Remove redundant -p flag in tests - Explain why git tag is being tested instead of the more obvious git column column.c | 3 ++- t/t7006-pager.sh | 14 ++

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

2017-10-14 Thread Kevin Daudt
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 droppin

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

2017-10-13 Thread Kevin Daudt
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 > +++ b/Documentation/git-for

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

2017-10-12 Thread Kevin Daudt
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

2017-10-12 Thread Kevin Daudt
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, 2009-10-

Re: Unable to use --patch with git add

2017-10-11 Thread Kevin Daudt
On Wed, Oct 11, 2017 at 11:16:39PM +0530, Ayush Goel wrote: > $ git --version > git version 2.14.2 > > What more details can I provide to help debug this? > Hello Ayush, Run: git config --global color.ui auto git config --unset --local color.ui #in case it's set locally This is a known 'b

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

2017-10-11 Thread Kevin Daudt
On Wed, Oct 11, 2017 at 08:12:35PM +0200, Martin Ågren wrote: > On 11 October 2017 at 19:23, Kevin Daudt wrote: > > finalize_colopts in column.c only checks whether the output is a TTY to > > determine if columns should be enabled with columns set to auto. Also check > > i

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

2017-10-11 Thread Kevin Daudt
auto. Also check if the pager is active. Helped-by: Rafael Ascensão Signed-off-by: Kevin Daudt --- column.c | 3 ++- t/t7006-pager.sh | 14 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/column.c b/column.c index ff7bdab1a..ded50337f 100644 --- a/colu

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

2017-10-10 Thread Kevin Daudt
On Tue, Oct 10, 2017 at 07:02:00PM +0200, Martin Ågren wrote: > On 10 October 2017 at 16:01, Jeff King wrote: > > On Tue, Oct 10, 2017 at 12:30:49PM +0200, Martin Ågren wrote: > >> On 9 October 2017 at 23:45, Kevin Daudt wrote: > >> > Since ff1e72483 (tag: change

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

2017-10-10 Thread Kevin Daudt
On Tue, Oct 10, 2017 at 07:04:42PM +0200, Martin Ågren wrote: > On 10 October 2017 at 16:29, Jeff King wrote: > > On Tue, Oct 10, 2017 at 10:10:19AM -0400, Jeff King wrote: > > > > it will randomly succeed or fail, depending on whether sed manages to > > read the input before the stdin terminal is

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

2017-10-09 Thread Kevin Daudt
t to autol. Also check if the pager is active. Helped-by: Rafael Ascensão Signed-off-by: Kevin Daudt --- 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 always, but not with auto. I could not get the te

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

2017-10-08 Thread Kevin Daudt
On Sun, Oct 08, 2017 at 05:07:12AM -0400, Robert P. J. Day wrote: > On Sun, 8 Oct 2017, Junio C Hamano wrote: > > > "Robert P. J. Day" writes: > > > > > ... so if, in the kernel source > > > tree, i ran: > > > > > > $ git rm \*.c > > > > > > i would end up removing *all* 25,569 "*.c" files in t

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

2017-10-06 Thread Kevin Daudt
On Fri, Oct 06, 2017 at 02:47:30PM +0200, Alexander Gehrke wrote: > After an update to version 2.14.2 from 2.14.1 "git add --patch" stopped > working > for me, just producing the same output as "git diff", but not prompting to > stage > anything. > > I found that unsetting the config key color.u

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

2017-10-04 Thread Kevin Daudt
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 > stashing,

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

2017-10-03 Thread Kevin Daudt
On Mon, Oct 02, 2017 at 01:38:17PM +0300, Tsvi Mostovicz wrote: > Hi, > > When setting "color.ui = always" in the last few versions (not sure > exactly when this started, but definitely exists in 2.14.1 and > 2.14.2), git add -p stops working as expected. Instead of prompting > the user, it skips

Re: will git rebase has side effect

2017-10-01 Thread Kevin Daudt
On Mon, Oct 02, 2017 at 12:06:38AM +0800, Yubin Ruan wrote: > 2017-10-01 22:17 GMT+08:00 Kevin Daudt : > > 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 of commit locally:

Re: will git rebase has side effect

2017-10-01 Thread Kevin Daudt
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 of commit locally: > > A --> B --> C --> D > > If I then add a few more commits locally > > A --> B --> C --> D --> E --> F --> G > > And then I do a rebase and squas

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

2017-09-30 Thread Kevin Daudt
On Sat, Sep 30, 2017 at 05:27:22AM -0400, Robert P. J. Day wrote: > > just noticed that in "man git-checkout", the SYNOPSIS contains the > line: > > git checkout [-p|--patch] [] [--] [...] > > implying that is optional, but further down in the > DESCRIPTION, one reads: > > git checkout [

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

2017-09-25 Thread Kevin Daudt
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 check

Re: [PATCH] t2018: remove unwanted empty line

2017-09-17 Thread Kevin Daudt
On Sun, Sep 17, 2017 at 10:19:28AM +, Kaartic Sivaraam wrote: > Signed-off-by: Kaartic Sivaraam > --- > t/t2018-checkout-branch.sh | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh > index 2131fb2a5682c..e0a52334a22dd 100755 > ---

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

2017-09-15 Thread Kevin Daudt
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 dist

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

2017-09-14 Thread Kevin Daudt
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 deb

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

2017-09-13 Thread Kevin Daudt
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 no

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

2017-09-11 Thread Kevin Daudt
On Tue, Sep 12, 2017 at 11:28:00AM +0900, Junio C Hamano wrote: > Kevin Daudt writes: > > > The synopsis and description inconsistently add a '=' between the > > argument name and it's value. Make this consistent. > > > > Signed-off-by: Kevin D

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

2017-09-11 Thread Kevin Daudt
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 --- Documentation/git-for-each-ref.txt | 18 +- 1 file changed, 9 insertions(+), 9 deletions

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

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

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

2017-09-01 Thread Kevin Daudt
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 --- Documentation/git-for-each-ref.txt | 18 +- 1 file changed, 9 insertions(+), 9 deletions

Re: Bug report

2017-08-30 Thread Kevin Daudt
On Wed, Aug 30, 2017 at 11:25:00PM +0200, Aleksandar Pavic wrote: > I have a file > > app/Controller/CustomerCardVerificationController.php > > And when I take a look at changes log, I get this (no matter which tool I > use): > > 2017-07-31 19:41 dule o membership renew payment ema

Re: [RFC 5/7] http: send Git-Protocol-Version header

2017-08-30 Thread Kevin Daudt
On Thu, Aug 24, 2017 at 03:53:26PM -0700, Brandon Williams wrote: > Tell a serve that protocol v2 can be used by sending an http header > indicating this. s/serve/server/

Re: What does 'git blame --before -- ' supposed to mean?

2017-08-24 Thread Kevin Daudt
On Mon, Aug 21, 2017 at 12:15:59AM +0530, Kaartic Sivaraam wrote: > Hello all, > > I tried to do a 'git blame' on a file and wanted to see the blame > before a particular revision of that file. I initially didn't know that > you could achieve that with, > > $ git blame > > I thought I need

Re: Undocumented change in `git branch -M` behavior

2017-08-23 Thread Kevin Daudt
On Wed, Aug 23, 2017 at 01:13:34PM -0700, Nish Aravamudan wrote: > Hello, > > Hopefully, I've got this right -- I noticed a change in behavior in git > with Ubuntu 17.10, which recently got 2.14.1. Specifically, that when in > an orphaned branch, -M ends up moving HEAD to the new branch name, > cl

Re: How to force a push to succeed?

2017-08-23 Thread Kevin Daudt
On Tue, Aug 22, 2017 at 05:55:25PM -0400, Jeffrey Walton wrote: > I tested some changes that lead to a dead end. The changes need to be > removed. The changes were added in 7 commits. > > I went back in time to the point before the changes: > > $ git reset --hard HEAD~7 > HEAD is now at 5

Re: git fetch with refspec does not include tags?

2017-08-17 Thread Kevin Daudt
On Thu, Aug 17, 2017 at 01:38:36PM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > On Thu, Aug 17, 2017 at 12:38:58PM -0700, Junio C Hamano wrote: > >> Jeff King writes: > >> > >> > # no tags, we just populate FETCH_HEAD because of

Re: git fetch with refspec does not include tags?

2017-08-17 Thread Kevin Daudt
On Thu, Aug 17, 2017 at 12:38:58PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > # no tags, we just populate FETCH_HEAD because of the bare URL > > git fetch ../parent > > > > # this does fetch tags, because we're storing the result according to > > # the configured refspec ("ref

Re: git clean -fdx deletes tracked files

2017-08-15 Thread Kevin Daudt
On Tue, Aug 15, 2017 at 08:45:20PM +0200, Kim Birkelund wrote: > Hi > > I hope this is gonna sound as weird to you as it does to me. > > The link below is a zip of a small git repository that I can reproduce > the bug in on 2 machines. > > Repo: https://www.dropbox.com/s/fz4d0i5ko7s7ktr/test.zip

[PATCH v2] stash: prevent warning about null bytes in input

2017-08-14 Thread Kevin Daudt
: git-stash: line 43: warning: command substitution: ignored null byte in input Signed-off-by: Kevin Daudt --- git-stash.sh | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 9b6c2da7b..5f09a47f0 100755 --- a/git-stash.sh

Re: [PATCH] stash: prevent warning about null bytes in input

2017-08-14 Thread Kevin Daudt
On Mon, Aug 14, 2017 at 12:51:26PM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > The no_changes function calls the untracked_files function through > > command substitution. untracked_files will return null bytes because it > > runs ls-files with the '-

  1   2   3   >