[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

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:

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

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

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

[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

[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

[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

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

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

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

[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

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 &

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

[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

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

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

[BUG] pre-applypatch can no longer add to staging area

Hi, At $dayjob we've been using a pre-applypatch hook to keep an eye on some software metrics as sub-area maintainers receive changes from developers. When a particular metric goes up we inform the maintainer that they should reject the patch and stop 'git am' from continuing. When the metric

Re: Why are submodules not automatically handled by default or at least configurable to do so?

On Mon, Oct 26, 2015 at 12:10 PM, John Smith wrote: > I found that I use submodules much, much more often in my git projects than I > used externals > in Subversion and the reason is that git encourages/forces to organize large > projects into > smaller repositories, one

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

Re: Git book figure bug

On Wed, Sep 2, 2015 at 7:45 PM, Jesper Jørgensen wrote: > Hi, > > I am learning how git works, and is using the excellent book on the official > site. > I believe I have located a mistake in one of the images. > It is about Figure 3.17 on this page : >

Re: [PATCH] git-submodule: remove extraneous space from error message

\$sha1') must_die_on_failure=yes ;; -- 2.5.0 Looks good to me. Thanks Reviewed-by: Chris Packham judge.pack...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH 0/7] Flags and config to sign pushes by default

Bike shedding a little (I've never used the signed push functionality) On Fri, Aug 14, 2015 at 7:00 AM, Dave Borowitz dborow...@google.com wrote: The if-possible name and weird tri-state boolean is basically a straw man, and I am happy to change if someone has a clearer suggestion. what about

Error when cloning with weird local directory

Hi All, A developer at $dayjob called me over to have a look at a git error he was getting (names changed to protect the innocent). $ git --version git version 2.5.0 $ git clone ssh://example.com/repo.git Cloning into 'repo'... fatal: I don't handle protocol '/home/user/src/ssh' After

Re: default configuration files on cygwin

On Tue, Jul 28, 2015 at 7:10 PM, Filippo Gatti filippo.ga...@centralesupelec.fr wrote: Hi, I'm currently running git on a cygwin platform. I would like to know how i can set up a sort of configuration file to launch automatically the ssh-agent and get connected to github (for istance)

Re: git-archive ignores submodules

On Fri, Apr 17, 2015 at 7:59 AM, Pedro Rodrigues prodrigues1...@gmail.com wrote: snip Not completely off topic, but for consistency consider that: git-clone supports --recursive and --recurse-submodules, which do the same thing. git-pull and git-push only support --recurse-submodules. It

Re: [bug (maybe)] Applying patch with '---'

On Wed, Apr 1, 2015 at 7:20 PM, Junio C Hamano gits...@pobox.com wrote: Chris Packham judge.pack...@gmail.com writes: So I was just sent a patch generated with 'git format-patch' that 'git am' fails to apply correctly. It applies but part of the commit message is lost. The problem

[bug (maybe)] Applying patch with '---'

Hi List, So I was just sent a patch generated with 'git format-patch' that 'git am' fails to apply correctly. It applies but part of the commit message is lost. The problem is that the commit message has lines like --- Foo happened did some things to handle Foo --- Bar happened Still

Re: Need help deciding between subtree and submodule

My $0.02 based on $dayjob (disclaimer I've never used subtree) On Wed, Mar 18, 2015 at 11:14 AM, Robert Dailey rcdailey.li...@gmail.com wrote: At my workplace, the team is using Atlassian Stash + git We have a Core library that is our common code between various projects. To avoid a single

Re: git submodule: update=!command

A little late to this thread On Wed, Mar 18, 2015 at 8:50 AM, Jeff King p...@peff.net wrote: On Tue, Mar 17, 2015 at 03:28:57PM -0400, Ryan Lortie wrote: The first is a question about git's basic policy with respect to things like this. I hope that it's safe to assume that running 'git'

Re: git submodule: update=!command

On Wed, Mar 18, 2015 at 10:05 AM, Junio C Hamano gits...@pobox.com wrote: Ryan Lortie de...@desrt.ca writes: On Tue, Mar 17, 2015, at 16:49, Junio C Hamano wrote: With more recent versions of Git, namely, the versions after 30a52c1d (Merge branch 'ms/submodule-update-config-doc' into maint,

Re: git submodule: update=!command

On Wed, Mar 18, 2015 at 8:43 PM, Chris Packham judge.pack...@gmail.com wrote: On Wed, Mar 18, 2015 at 10:05 AM, Junio C Hamano gits...@pobox.com wrote: Ryan Lortie de...@desrt.ca writes: On Tue, Mar 17, 2015, at 16:49, Junio C Hamano wrote: With more recent versions of Git, namely

Re: Windows Bluescreen

issue with windows, but can't find it now. https://github.com/msysgit/git/issues Happy hunting :). Actually if it is a ssh problem it might be a generic MSYS issue. So there's another bug tracker to look through http://sourceforge.net/p/mingw/bugs/ On Wed, Feb 11, 2015 at 3:56 AM, Chris Packham

Re: Windows Bluescreen

Hi Erik, On Tue, Feb 10, 2015 at 9:12 AM, e...@aercon.net wrote: I find that preview 1.8 is bluescreening on about 1 of 3 ssh pushes. 1.9 preview 12-17-2014 doesn't even bluescreen, the windows gui locks until reset. Does this mean that pushing over git:// file:// and http:// are

Re: [PATCH 1/2] Fixes _is_git

+ if {[regexp ^gitdir: (.+)$ $line line link_target]} { 2015-02-03 3:44 UTC-05:00, Chris Packham judge.pack...@gmail.com: It might be simpler to use one of the 'string' commands e.g. string wordend gitdir: I also suspect the string functions would be faster than regexp

Re: [PATCH 1/2] Fixes _is_git

Hi Remi, Added Pat Thoyts the git-gui maintainer. (Disclaimer, it's been years since I did anything with Tcl). On Tue, Feb 3, 2015 at 6:24 AM, Remi Rampin remiram...@gmail.com wrote: Function _git_dir would previously fail to accept a gitdir: ... file as a valid Git repository. ---

Re: [PATCH 2/2] Makes _do_open2 set _gitdir to actual path

On Tue, Feb 3, 2015 at 6:24 AM, Remi Rampin remiram...@gmail.com wrote: If _is_git had to follow gitdir: ... files to reach the actual Git directory, we set _gitdir to that final path. --- lib/choose_repository.tcl | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff

Re: [git-gui] bug report: Open existing repository dialog fails on submodules

does not handle a gitfiles which have been used for submodules for some time. Instead of using a custom function let's just ask git rev-parse. Signed-off-by: Chris Packham chris.pack...@alliedtelesis.co.nz --- lib/choose_repository.tcl | 15 --- 1 file changed, 4 insertions(+), 11

Re: [git-gui] bug report: Open existing repository dialog fails on submodules

On Mon, Feb 2, 2015 at 9:41 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, On Sat, Jan 31, 2015 at 10:46 AM, Rémi Rampin remiram...@gmail.com wrote: Hi, This bug report concerns git-gui. Apologies if this is not the right mailing-list. By submodule I mean a repository for which .git

Re: git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

Hi, On Thu, Jan 29, 2015 at 8:49 AM, Dick d...@mrns.nl wrote: Hi all, I've encountered a problem with the Dictator and Lieutenants Workflow. I've configured remote origin so it pulls from the blessed repository and pushes to the developer public repository. When the blessed repository has

Re: git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

On Fri, Jan 30, 2015 at 6:27 AM, Chris Packham judge.pack...@gmail.com wrote: Hi, On Thu, Jan 29, 2015 at 8:49 AM, Dick d...@mrns.nl wrote: Hi all, I've encountered a problem with the Dictator and Lieutenants Workflow. I've configured remote origin so it pulls from the blessed repository

Re: [PATCH 2/2] test-lib.sh: Dynamic test for the prerequisite SANITY

Minor typo in a comment. On Wed, Jan 28, 2015 at 4:39 AM, Torsten Bögershausen tbo...@web.de wrote: The SANITY precondition was not set when running as root, but this is not 100% reliable for CYGWIN: A file may be allowed to be deleted when the containing directory does not have write

Re: [PATCH] INSTALL: minor typo fix

On Wed, Jan 28, 2015 at 6:09 AM, Chris Packham judge.pack...@gmail.com wrote: Hi Alexander On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1

Re: [PATCH] INSTALL: minor typo fix

Hi Alexander On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index ffb071e..6f1c3d5 100644 ---

Re: Git submodule first time update with proxy

Hi, On Fri, Jan 23, 2015 at 3:50 PM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a submodule using HTTP URL. I do this: $ git submodule init MySubmodule $ git submodule update MySubmodule The 2nd command fails because the HTTP URL cannot be resolved, this is because it requires a

Re: Git submodule first time update with proxy

On Sat, Jan 24, 2015 at 5:45 PM, Robert Dailey rcdailey.li...@gmail.com wrote: On Fri, Jan 23, 2015 at 10:23 PM, Robert Dailey rcdailey.li...@gmail.com wrote: On Fri, Jan 23, 2015 at 4:13 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, On Fri, Jan 23, 2015 at 3:50 PM, Robert Dailey

Re: Odd git am behavior rewriting subject, adding ASoC: prefix

On Wed, Nov 5, 2014 at 2:12 PM, Joe Perches j...@perches.com wrote: I have a patch file created by git format-patch. Applying it via git am changes the subject prefix. Anyone know why? $ git --version git version 2.1.2 $ git am -i 0002-staging-ft1000-Logging-message-neatening.patch

[gitk PATCH] gitk: Default wrcomcmd to use --pretty=email

This makes the Write commit to file context menu option generate a file that is consumable by 'git am'. Signed-off-by: Chris Packham judge.pack...@gmail.com --- Hi Paul, This is the other side of a git patch I was looking at a while ago[1]. The basic problem was people were using gitk's Write

Re: [TOY PATCH]: rebase: Add --show-files option

Hi, On Fri, Oct 3, 2014 at 5:42 PM, Nazri Ramliy ayieh...@gmail.com wrote: Hi, When working on a new feature branch that touches a lot of files I tend to make commits that affect only single files, and for very small changes. Since at this stage I'm experimentating a lot - trying out ideas,

[RFC PATCHv3 0/4] am: patch-format

filter programs. Chris Packham (4): am: avoid re-directing stdin twice t/am: add test for stgit patch format t/am: add tests for hg patch format am: add gitk patch format Documentation/git-am.txt | 3 +- git-am.sh| 38 +++- t/t4150-am.sh| 76

[RFC PATCHv3 1/4] am: avoid re-directing stdin twice

pipe tr: write error Patch format detection failed. Cc: Stephen Boyd bebar...@gmail.com Signed-off-by: Chris Packham judge.pack...@gmail.com --- Nothing new since http://article.gmane.org/gmane.comp.version-control.git/256425 git-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[RFC PATCHv3 4/4] am: add gitk patch format

-by: Chris Packham judge.pack...@gmail.com --- This hasn't materially changed from the version Junio expressed reservations about[1]. It solves my immediate problem but perhaps this (as well as stgit and hg) belong as external filters in a pipeline before git am. Or maybe mailsplit should absorb

[RFC PATCHv3 2/4] t/am: add test for stgit patch format

This adds a tests which exercise the detection of the stgit format. There is a current know breakage in that the code that deals with stgit in split_patches can't handle reading from stdin. Signed-off-by: Chris Packham judge.pack...@gmail.com --- t/t4150-am.sh | 27 +++ 1

[RFC PATCHv3 3/4] t/am: add tests for hg patch format

This adds a tests which exercise the detection of the hg format. As with stgit there is a current know breakage in where split_patches can't handle reading from stdin with these patch formats. Cc: Giuseppe Bilotta giuseppe.bilo...@gmail.com Signed-off-by: Chris Packham judge.pack...@gmail.com

Re: [RFC PATCHv3 1/4] am: avoid re-directing stdin twice

On Sat, Sep 6, 2014 at 8:26 AM, Johannes Sixt j...@kdbg.org wrote: Am 05.09.2014 12:06, schrieb Chris Packham: In check_patch_format we feed $1 to a block that attempts to determine the patch format. Since we've already redirected $1 to stdin there is no need to redirect it again when we

Re: [RFC PATCHv2 1/2] am: add gitk patch format

On Sat, Sep 6, 2014 at 6:29 AM, Junio C Hamano gits...@pobox.com wrote: Chris Packham judge.pack...@gmail.com writes: So teaching git mailinfo to do s/^// (either when asked to or using some heuristic) would be a better approach? I also think we should accept Author: as an acceptable

Re: [RFC PATCHv2 1/2] am: add gitk patch format

Hi Junio, On Fri, Sep 5, 2014 at 5:21 AM, Junio C Hamano gits...@pobox.com wrote: Chris Packham judge.pack...@gmail.com writes: Another thing that I've since realised is that this 'gitk' format is also what you've get from git show or git log -p. So this is actually allowing (for better

Re: [RFC PATCHv2 1/2] am: add gitk patch format

(added back git ml because I accidentally dropped the Cc when replying to Junio). On Fri, Sep 5, 2014 at 10:57 AM, Junio C Hamano gits...@pobox.com wrote: I doubt that a patchset that does not update mailinfo and mailsplit to extract information and to undo the indentation could be a right

Re: Issuing warning when hook does not have execution permission

On Wed, Aug 20, 2014 at 4:52 AM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: On Tue, Aug 19, 2014 at 04:05:21PM +1000, Babak M wrote: I saw that if a hook file is present in .git/hooks and it does not have execution permissions it is silently ignored. I thought

[BUG] Hang when I did something a bit weird with submodules

Hi, I was just setting up a new project using submodules and have run into what appears to be a hang when git status is invoked. I haven't tried to reproduce this but this is basically what I did (edited highlights from my bash_history). $ git --version git version 2.0.3 $ mkdir proj $ cd

Re: [BUG] Hang when I did something a bit weird with submodules

On Tue, Aug 19, 2014 at 4:33 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, I was just setting up a new project using submodules and have run into what appears to be a hang when git status is invoked. I haven't tried to reproduce this but this is basically what I did (edited highlights

Re: Sharing merge conflict resolution between multiple developers

On Tue, Aug 12, 2014 at 6:44 AM, Junio C Hamano gits...@pobox.com wrote: Chris Packham judge.pack...@gmail.com writes: Is there any way where we could share the conflict resolution around but still end up with a single merge commit. One idea that immediately comes to me is to use something

Sharing merge conflict resolution between multiple developers

Hi List, At $dayjob we maintain internal forks of the a number of upstream repositories. Unsurprisingly updating these forks can be extremely problematic, especially when it's only one person doing the merge. Fortunately most of us are in the same physical location so it is possible to drag in

Re: confused about remote branch management

On 23/07/14 14:49, Ross Boylan wrote: My local master branch is the result of a merge of upstream master and some local changes. I want to merge in more recent upstream work. git pull doesn't seem to have updated origin/master, and git checkout origin/master also doesn't seem to work.

Re: [RFC PATCH] clone: add clone.recursesubmodules config option

On 05/06/14 07:42, Heiko Voigt wrote: On Wed, Jun 04, 2014 at 10:24:06AM -0700, Junio C Hamano wrote: Chris Packham judge.pack...@gmail.com writes: On 04/06/14 09:05, Junio C Hamano wrote: Also, going --recursive when the user did not want is a lot more expensive mistake to fix than

[RFC PATCH] clone: add clone.recursesubmodules config option

Add a config option that will cause clone to recurse into submodules as if the --recurse-submodules option had been specified on the command line. This can be overridden with the --no-recurse-submodules option. Signed-off-by: Chris Packham judge.pack...@gmail.com --- On 04/06/14 09:05, Junio C

Re: [PATCH v2 2/2] connect.c: replace signal() with sigaction()

On 31/05/14 08:58, Jeremiah Mahler wrote: From signal(2) man page: The behavior of signal() varies across UNIX versions, and has also var‐ ied historically across different versions of Linux. Avoid its use: use sigaction(2) instead. Replaced signal() with sigaction() in

Re: .gitmodules containing SSH clone URLs should fall back to HTTPS when SSH key is not valid/existent

On Fri, May 30, 2014 at 11:12 AM, Jonathan Leonard johana...@gmail.com wrote: But you do not give much information about your special use case. I assume you have submodule repositories for which some developers have a valid ssh key and others don't (maybe because they should only have read

Re: [PATCH 1/5] progress.c: replace signal() with sigaction()

On 28/05/14 18:14, Jeremiah Mahler wrote: From signal(2) The behavior of signal() varies across UNIX versions, and has also var‐ ied historically across different versions of Linux. Avoid its use: use sigaction(2) instead. See Portability below. Minor nit. The last sentence

Re: [PATCH 0/5] replace signal() with sigaction()

On 28/05/14 19:40, Johannes Sixt wrote: Am 5/28/2014 8:14, schrieb Jeremiah Mahler: From signal(2) The behavior of signal() varies across UNIX versions, and has also var‐ ied historically across different versions of Linux. Avoid its use: use sigaction(2) instead. See Portability

Re: [PATCH] wording fixes in the user manual and glossary

On 25/05/14 20:37, Jeremiah Mahler wrote: On Sun, May 25, 2014 at 07:56:41PM +1200, Chris Packham wrote: On 25/05/14 15:50, Jeremiah Mahler wrote: Some minor wording fixes in the user manual and glossary. ... -Eventually the developer cloned from will do additional work in her +Eventually

Re: [PATCH] wording fixes in the user manual and glossary

On 25/05/14 15:50, Jeremiah Mahler wrote: Some minor wording fixes in the user manual and glossary. Signed-off-by: Jeremiah Mahler jmmah...@gmail.com --- Documentation/glossary-content.txt | 2 +- Documentation/user-manual.txt | 8 2 files changed, 5 insertions(+), 5

Re: [GIT GUI PATCH v2] git-gui: tolerate major version changes when comparing the git version

where the git version is tested for another feature. Reported-by: Chris Packham judge.pack...@gmail.com Reported-by: Yann Dirson ydir...@free.fr Helped-by: Pat Thoyts pattho...@users.sourceforge.net Signed-off-by: Jens Lehmann jens.lehm...@web.de --- Am 17.05.2014 14:23, schrieb Pat Thoyts

Re: [GIT GUI PATCH] git-gui: use vcompare when comparing the git version

is tested for another feature. Reported-by: Chris Packham judge.pack...@gmail.com Reported-by: Yann Dirson ydir...@free.fr Signed-off-by: Jens Lehmann jens.lehm...@web.de --- Looks good to me (refer to previous comment about being rusty with tcl). More importantly Tested-by: Chris Packham

Re: [BUG] git-gui regression in 2.0rcX within submodule

Hi, On 13/05/14 11:45, Yann Dirson wrote: In 2.0rc2, git-gui is unable to work inside submodules, where 1.9.2 did not show such a problem: yann@home:~$ cd /tmp/ yann@home:tmp$ mkdir foo yann@home:tmp$ cd foo/ yann@home:foo$ git init Initialized empty Git repository in /tmp/foo/.git/

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

Hi, On 06/05/14 11:50, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Tue, Apr 29, 2014 at 03:38:07PM -0700, Junio C Hamano wrote: * fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits ... Move remote-hg and remote-bzr out of contrib/. There were some

Re: Is there any efficient way to track history of a piece of code?

On 08/05/14 18:54, Jianyu Zhan wrote: Usually, a trivial change(like coding style fix) may bury a original change of the code, and thus git blame is of less help. And to address this situation, I have to do like this: git blame -s REF^ file-in-question temp to dig into the history

Re: git gui error with relocated repository

On 07/05/14 00:10, Pat Thoyts wrote: Chris Packham judge.pack...@gmail.com writes: On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham judge.pack...@gmail.com wrote: Hi Pat, I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) which includes gitgui-0.19.0 and I'm getting

Re: git gui error with relocated repository

On 07/05/14 19:28, Chris Packham wrote: On 07/05/14 00:10, Pat Thoyts wrote: Chris Packham judge.pack...@gmail.com writes: On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham judge.pack...@gmail.com wrote: Hi Pat, I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) which

material for git training sessions/presentations

Hi, I know there are a few people on this list that do git training in various forms. At $dayjob I've been asked to run a few training sessions in house. The initial audience is SW developers so they are fairly clued up on VCS concepts and most have some experience (although some not positive)

[GIT GUI PATCH] git-gui: unconditionally use rev-parse --show-toplevel

$GIT_DIR. Unfortunately vsatisfies doesn't handle versions like v2.0.0.rc0 so the fall-back logic is triggered. Given the fact that git 1.7.0 was released over 4 years ago rather than fixing the fall-back logic it seems reasonable to drop the version check. Signed-off-by: Chris Packham judge.pack

git gui error with relocated repository

Hi Pat, I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) which includes gitgui-0.19.0 and I'm getting a new error when I run 'git gui' in a repository with a .git file (created by git submodule). I can send you a screencap of the error message off list if you want but the

  1   2   >