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

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

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. >

Re: Mailsplit

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

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: BUG: No way to set fsck. when cloning

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

Re: Git push error due to hooks error

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

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

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

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]:

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

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

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

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

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

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`. > >

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

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

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

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 > > --- >

Re: Git on Mac - Segmentation fault:11

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

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

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

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

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

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: [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

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

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

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

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 3/3] builtin/describe: describe blobs

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

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

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

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

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

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

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

[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"

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*

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

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

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

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

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

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

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

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

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

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

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] 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 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

[PATCH] 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

Re: Bug report

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

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

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?

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

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

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, >

Re: How to force a push to succeed?

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

Re: git fetch with refspec does not include tags?

On Thu, Aug 17, 2017 at 01:38:36PM -0700, Junio C Hamano wrote: > Kevin Daudt <m...@ikke.info> writes: > > > On Thu, Aug 17, 2017 at 12:38:58PM -0700, Junio C Hamano wrote: > >> Jeff King <p...@peff.net> writes: > >> > >> > # no tag

Re: git fetch with refspec does not include tags?

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

Re: git clean -fdx deletes tracked files

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:

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

-stash: line 43: warning: command substitution: ignored null byte in input Signed-off-by: Kevin Daudt <m...@ikke.info> --- 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-st

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

On Mon, Aug 14, 2017 at 12:51:26PM -0700, Junio C Hamano wrote: > Kevin Daudt <m...@ikke.info> writes: > > > The no_changes function calls the untracked_files function through > > command substitution. untracked_files will return null bytes because it > > runs

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

bytes from the input. This warning is triggered when running git stash save -u resulting in two warnings: git-stash: line 43: warning: command substitution: ignored null byte in input Signed-off-by: Kevin Daudt <m...@ikke.info> --- git-stash.sh | 2 +- 1 file changed, 1 insertion

Re: Bug when stashing previously-ignored file plus associated .gitignore change

On Fri, Aug 11, 2017 at 04:55:38PM +0100, Sam Partington wrote: > Hi there, > > I'm running git 2.7.4 on Ubuntu 16.04. I've found a couple of > problems when "un-ignoring" files in tandem with git stash. > > Here's how to reproduce: > > Say you have a project using git, with a .gitignore file

Re: Small typo in german translation

On Mon, Jul 10, 2017 at 08:47:23AM +0200, Andre Hinrichs wrote: > Hi Git-Developers! > > I've found a small typo in git/po/de.po > In line 8567 the word "erwzingen" should be "erzwingen". > Please fix. > > Thanks > Hello Andre, The best way to get this fixed is to make a pull-request on the

Re: [PATCH] merge-message: change meaning of "empty merge message"

On Thu, Jul 06, 2017 at 09:01:49AM +0530, Kaartic Sivaraam wrote: > In the context of "git merge" the meaning of an "empty message" > is one that contains no line of text. This is not in line with > "git commit" where an "empty message" is one that contains only > whitespaces and/or signed-off-by

Re: Small issue with "add untracked" option of 'git add -i'

On Wed, Jun 21, 2017 at 08:25:26AM +0530, Kaartic Sivaraam wrote: > > I tried applying the patch and building it locally. For some reason I > couldn't see the change in effect. What could I be missing? > Did you make sure you used the git you built, and also the relevant subcommands? What does

Re: 'pu' broken at t5304 tonight

On Sat, Jun 10, 2017 at 02:48:36PM +0200, Kevin Daudt wrote: > On Sat, Jun 10, 2017 at 03:07:01PM +0900, Junio C Hamano wrote: > > I didn't check where it goes wrong. Here is a list of suspects, > > taken by > > > > $ git shortlog --no-merges pu@{8.hours

Re: 'pu' broken at t5304 tonight

On Sat, Jun 10, 2017 at 03:07:01PM +0900, Junio C Hamano wrote: > I didn't check where it goes wrong. Here is a list of suspects, > taken by > > $ git shortlog --no-merges pu@{8.hours}..pu > > i.e. patches that weren't in pu before today's integration cycle. > > Andreas Heiduk (1): >

Re: [PATCH] Fourth batch for 2.14

On Wed, Jun 07, 2017 at 12:33:41PM +0200, Kevin Daudt wrote: > From: Junio C Hamano <gits...@pobox.com> > sorry for the noise, please ignore this.

[PATCH] Fourth batch for 2.14

From: Junio C Hamano <gits...@pobox.com> Signed-off-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: Kevin Daudt <m...@ikke.info> --- Documentation/RelNotes/2.14.0.txt | 55 +++ 1 file changed, 55 insertions(+) diff --git a/Documentati

Re: [BUG] Failed to sign commit

On Wed, Jun 07, 2017 at 10:46:08AM +0100, pedro rijo wrote: > Recently I've updated a bunch of stuff, including git and gpg. I'm using > > - mac OS 10.10.5 > - git 2.13.1 > - gpg (GnuPG) 2.1.21 / libgcrypt 1.7.7 > > When I do > > $ git commit --allow-empty -v -m "lol" > error: gpg failed to

Re: Git Merge 2017 Videos

On Sun, Jun 04, 2017 at 11:24:17AM +0100, Philip Oakley wrote: > While looking at the recent .gitignore issue (the need to use `**`) I came > up against a comment in > https://public-inbox.org/git/cagz79kzqsaubfotjyqm+-+ljyyec2ykj5exuy5kderezfh0...@mail.gmail.com/ > noting that the Git Merge 2017

Re: wrong language translation part7

On Thu, Jun 01, 2017 at 01:16:11PM +0200, SJR wrote: > W dniu 1 czerwca 2017 09:43 użytkownik SJR napisał: > > > > Hi, > > > > https://git-scm.com/book/pl/v1/Dostosowywanie-Gita-Konfiguracja-Gita > > > > part in polish part in english. > > > > Can You repair translation? > > >

Re: git rebase regression: cannot pass a shell expression directly to --exec

On Tue, May 16, 2017 at 09:59:03AM -0700, Eric Rannaud wrote: > On Tue, May 16, 2017 at 9:18 AM, Jeff King wrote: > > On Tue, May 16, 2017 at 12:23:02PM +0200, Johannes Schindelin wrote: > >> It would appear to me that you used a side effect of an implementation > >> detail: that

Re: Cant clone/pull/fetch because of "Unable to create temporary file '$HOME/Dev/linux-stable/.git/objects/pack/tmp_pack_'

On Mon, May 15, 2017 at 12:28:58AM +0200, Thomas Schweikle wrote: > $ git clone > https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git > linux-stable > Cloning into 'linux-stable'... > remote: Counting objects: 5932092, done. > remote: Compressing objects: 100% (154131/154131),

Re: git error

On Fri, May 05, 2017 at 10:52:13AM +0800, ada wrote: > hi, > > I used the command below,there's an error,please help me to solve it ! > Thank you ~ > git push > > > Best Regards~ > ada Wang > Hello Ada, In order for people to be able to help you, you should provide more details about your

Re: PCRE v2 compile error, was Re: What's cooking in git.git (May 2017, #01; Mon, 1)

On Tue, May 02, 2017 at 08:52:21PM +0200, Ævar Arnfjörð Bjarmason wrote: > > * Due to the bizarro existing semantics of the configure script noted > upthread if you have a git build script that does --with-libpcre & you > have libpcre1 installed, it'll link to it, but now since > --with-libpcre

  1   2   3   >