Re: storing cover letter of a patch series?

On Fri, Sep 11, 2015 at 4:28 AM, Jacob Keller wrote: > Hey, > > does anyone know of any tricks for storing a cover letter for a patch > series inside of git somehow? I'd guess the only obvious way currently > is to store it at the top of the series as an empty commit.. but

[BUG?] applypatch-msg hook no-longer thinks stdin is a tty

Hi, I have a applypatch-msg hook that implements some policy for acceptable commit messages and reject non-conformant patches. It also is able to prompt me to override it's rejection. The prompting only happens when stdin is a tty (as determined by pythons sys.stdin.isatty()) For example this

Re: [BUG?] applypatch-msg hook no-longer thinks stdin is a tty

On Sat, Oct 3, 2015 at 6:43 AM, Junio C Hamano <gits...@pobox.com> wrote: > Junio C Hamano <gits...@pobox.com> writes: > >> Chris Packham <judge.pack...@gmail.com> writes: >> >>> As of git 2.6 this has stopped working and stdin always fails the t

[bug] assertion in 2.8.4 triggering on old-ish worktree

Hi All, I have the git-sh-prompt configured in my .bashrc today I visited an old worktree that I haven't really touched in a few years (sorry can't remember the git version I was using back then). I received the following output when changing to the directory git: pathspec.c:317:

Re: [bug] assertion in 2.8.4 triggering on old-ish worktree

On Thu, Jun 16, 2016 at 4:59 PM, Chris Packham <judge.pack...@gmail.com> wrote: > Hi All, > > I have the git-sh-prompt configured in my .bashrc today I visited an > old worktree that I haven't really touched in a few years (sorry can't > remember the git version I was using b

Re: [bug] assertion in 2.8.4 triggering on old-ish worktree

On Fri, Jun 17, 2016 at 7:48 AM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Jun 16, 2016 at 10:59 AM, Junio C Hamano <gits...@pobox.com> wrote: >> Chris Packham <judge.pack...@gmail.com> writes: >> >>> On Thu, Jun 16, 2016 at 4:59 PM, Chris Pa

Re: Triangular workflows and some anecdotes from the trenches

On Wed, Apr 6, 2016 at 10:24 AM, Junio C Hamano <gits...@pobox.com> wrote: > Chris Packham <judge.pack...@gmail.com> writes: > >> We ran into something at $dayjob the other day. The actual problem was >> a developer ended up amending a commit that had alre

Triangular workflows and some anecdotes from the trenches

Hi, We ran into something at $dayjob the other day. The actual problem was a developer ended up amending a commit that had already been pushed. It happens occasionally and is usually recoverable with a simple rebase and is generally a learning experience. In this particular case however things

Re: git difftool help

On Tue, Mar 29, 2016 at 3:07 AM, ratheesh kannoth wrote: > 'git diff 'is opening in meld. I could not create a patch using - git > diff > ./patch-01 > i did not make any change to pick meld, by default it is picking meld. > > > Which "git difftool" will help to create

Re: Problem with git-http-backend.exe as iis cgi

Hi Florian On Tue, Mar 29, 2016 at 7:01 PM, Florian Manschwetus wrote: > Hi, > I put together a first patch for the issue. > > Mit freundlichen Grüßen / With kind regards > Florian Manschwetus > > E-Mail: manschwe...@cs-software-gmbh.de > Tel.: +49-(0)611-8908534

[PATCHv1] completion: add option '--recurse-submodules' to 'git clone'

Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- Hi, I noticed --recurse-submodules was missing from the bash completion. This adds it. I went for '--recurse-submodules' instead of '--recursive' as I seem to recall the former being agreed upon as the better (or least amb

[RFC/PATCH] rebase--interactive: Add "sign" command

This is similar to the existing "reword" command in that it can be used to update the commit message the difference is that the editor presented to the user for the commit. It provides a useful shorthand for "exec git commit --amend --no-edit -s" Signed-off-by: Chris

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

On Thu, Aug 4, 2016 at 6:08 AM, Jeff King wrote: > On Wed, Aug 03, 2016 at 09:08:48AM -0700, Junio C Hamano wrote: > >> > However, I could imagine that we actually want this to be more extensible. >> > After all, all you are doing is to introduce a new rebase -i command that >> >

Re: [RFC/PATCH] rebase--interactive: Add "sign" command

On Thu, Aug 4, 2016 at 2:31 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Chris, > > On Wed, 3 Aug 2016, Chris Packham wrote: > >> This is similar to the existing "reword" command in that it can be used >> to update the commit message the

[RFC PATCH] completion: support excluding refs

Allow completion of refs with a ^ prefix. This allows completion of commands like 'git log HEAD ^origin/master'. Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- I often find myself using variations of 'git log HEAD ^origin/master' to see commits that I have locally that have no

Re: Any interest in 'git merge --continue' as a command

On Sat, Dec 10, 2016 at 8:16 AM, Junio C Hamano wrote: > Jeff King writes: > >>> They knew about git rebase --continue (and git am and git cherry-pick) >>> but they were unsure how to "continue" a merge (it didn't help that >>> the advice saying to use 'git

Any interest in 'git merge --continue' as a command

I hit this at $dayjob recently. A developer had got themselves into a confused state when needing to resolve a merge conflict. They knew about git rebase --continue (and git am and git cherry-pick) but they were unsure how to "continue" a merge (it didn't help that the advice saying to use 'git

[RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'

to 'git merge' presents a consistent UI. Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- So here is a quick patch that adds the --continue option. I need to add some tests (suggestions for where to start are welcome). Documentation/git-merge.txt | 13 - builtin/m

Re: [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'

On Mon, Dec 12, 2016 at 10:02 PM, Markus Hitter <m...@jump-ing.de> wrote: > Am 12.12.2016 um 09:34 schrieb Chris Packham: >> Teach 'git merge' the --continue option which allows 'continuing' a >> merge by completing it. The traditional way of completing a merge after &

[PATCHv2 1/2] merge: Add '--continue' option as a synonym for 'git commit'

to 'git merge' presents a consistent UI. Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- Notes: Changes in v2: - add --continue to builtin_merge_usage - verify that no other arguments are present when --continue is used. - add basic test Documentation/git-merge.tx

[PATCHv2 2/2] completion: add --continue option for merge

Add 'git merge --continue' option when completing. Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- Notes: Changes in v2: - new. contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completio

[PATCH 2/3] completion: add --continue option for merge

Add 'git merge --continue' option when completing. Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- Changes in v2: - new Changes in v3: - none contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completi

[PATCH 3/3] merge: Ensure '--abort' option takes no arguments

Like '--continue', the '--abort' option doesn't make any sense with other options or arguments to 'git merge' so ensure that none are present. Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- Changes in v3: - new builtin/merge.c | 4 t/t7600-merge.sh | 2 ++ 2 files chan

[PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit'

to 'git merge' presents a consistent UI. Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- Changes in v2: - add --continue to builtin_merge_usage - verify that no other arguments are present when --continue is used. - add basic test Changes in v3: - check for other options in a

[RFC/PATCHv2] Makefile: add cppcheck target

be enabled by specifying CPPCHECK_ADD. This is a comma separated list which is passed to cppcheck's --enable option. To enable style and warning checks run make cppcheck CPPCHECK_ADD=style,warning Based-on-patch-by: Elia Pinto <gitter.spi...@gmail.com> Signed-off-by: Chris Packham <j

Re: [RFC/PATCH] Makefile: add cppcheck target

On Wed, Dec 14, 2016 at 1:28 AM, Jeff King wrote: > On Tue, Dec 13, 2016 at 07:15:10AM -0500, Jeff King wrote: > >> I think these last two are a good sign that we need to be feeding the >> list of source files to cppcheck. I tried your patch and it also started >> looking in

Re: [RFC/PATCH] Makefile: add cppcheck target

On Wed, Dec 14, 2016 at 1:15 AM, Jeff King <p...@peff.net> wrote: > On Tue, Dec 13, 2016 at 10:22:25PM +1300, Chris Packham wrote: > >> $ make cppcheck >> cppcheck --force --quiet --inline-suppr . >> [compat/nedmalloc/malloc.c.h:4093]: (error) Possible null pointer

[RFC/PATCH] Makefile: suppress some cppcheck false-positives

Pass a list of suppressions to cppcheck so that legitimate errors are more obvious. Signed-off-by: Chris Packham <judge.pack...@gmail.com> --- On Thu, Dec 15, 2016 at 12:24 AM, Jeff King <p...@peff.net> wrote: > The patch itself is OK to me, I guess. The interesting part will be &

[RFC/PATCH] Makefile: add cppcheck target

Add cppcheck target to Makefile. Cppcheck is a static analysis tool for C/C++ code. Cppcheck primarily detects the types of bugs that the compilers normally do not detect. It is an useful target for doing QA analysis. Based-on-patch-by: Elia Pinto <gitter.spi...@gmail.com> Signed-off-by:

Re: [RFC/PATCH] Makefile: add cppcheck target

On Tue, Dec 13, 2016 at 10:22 PM, Chris Packham <judge.pack...@gmail.com> wrote: > Add cppcheck target to Makefile. Cppcheck is a static > analysis tool for C/C++ code. Cppcheck primarily detects > the types of bugs that the compilers normally do not detect. > It is an useful t

Re: [PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit'

On Thu, Dec 15, 2016 at 7:04 AM, Junio C Hamano wrote: > The last one 3/3 is a nice touch that makes sure that we do not > forget what we discovered during the discussion. Very much > appreciated. > > Will queue. Thanks. Did you want me to send a v4 to mark the strings for

Re: Suggestion for the "Did you mean this?" feature

On Mon, Dec 19, 2016 at 1:18 AM, Kaartic Sivaraam wrote: > Hello all, > > I have found the "Did you mean this?" feature of git as a very good > feature. I thought it would be even better if it took a step toward by > asking for a prompt when there was only one

Re: [RFC/PATCHv2] Makefile: add cppcheck target

On Fri, Dec 16, 2016 at 9:28 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > > On 14 Dec 2016, at 12:24, Jeff King <p...@peff.net> wrote: > > On Wed, Dec 14, 2016 at 10:27:31PM +1300, Chris Packham wrote: > > Changes in v2: > > - only run over actual gi

Re: [Bug] Unicode display

Hi, On Wed, Mar 15, 2017 at 5:51 PM, Dũng Đặng Minh wrote: > Hi Git team, > > Thank you all for create a great tool. > Last week, I updated the last version of git (2.12.0 x64-Windows) and > all Unicode characters are display un-correctly. You can see: >

Re: git with ssh won't pull submodule

Hi Erik, On Fri, Apr 28, 2017 at 11:25 AM, Erik Haller wrote: > Getting the following error for a submodule when using git/ssh: > > $ git clone --recursive ssh://incense:/home/erik/git/nacl.git > Cloning into 'nacl'... > remote: Counting objects: 32, done. > remote:

[buglet] gitk and git cherry-pick --abort interaction

Apologies in advance for the vagueness of this bug report. I was juggling a few patches around in a git repo (happens to be linux but that's probably not particularly relevant). I'd been reverting, rebasing and cherry-picking on the CLI. Then I found I needed one more commit which I located with

<    1   2