How to handle false-positive with git-cherry ?

Hi, I have several "maintainance" branches which are based on different version of my software, which contains only fixes, imported with 'git cherry-pick'. I use to comparing stable branches to see if one of them is not missing a fix for instance. For that purpose I use "git cherry" of "git log -

git-cherry doesn't detect a "copied" commit

Hi, I'm seeing something odd with git-cherry: it doesn't seem to detect that a commit has been cherry-picked from master branch. This happens with the systemd git repository (from github) so it should be fairly simple to reproduce. What I did: $ git --version git version 2.6.0 $ git checkout -b

Re: git-cherry doesn't detect a "copied" commit

Hi, On Tue, Oct 20, 2015 at 6:32 PM, Francis Moreau wrote: > Hi, > > I'm seeing something odd with git-cherry: it doesn't seem to detect > that a commit has been cherry-picked from master branch. > > This happens with the systemd git repository (from github) so it

Re: git-cherry doesn't detect a "copied" commit

On Fri, Oct 23, 2015 at 12:57 PM, Kevin Daudt wrote: > On Tue, Oct 20, 2015 at 06:32:12PM +0200, Francis Moreau wrote: >> Hi, >> >> I'm seeing something odd with git-cherry: it doesn't seem to detect >> that a commit has been cherry-picked from master branch

Question about about a trivial merge conflict that git should resolve alone

Hi, I have a simple merge conflict use case: $ mkdir foo $ cd foo/ $ git init $ echo line1 > a $ git add . $ git commit -q -m init $ echo line2 >>a $ git commit -a -q -m "add line2" $ git checkout -b foo HEAD~1 $ git cherry-pick -x master $ echo line3 >>a $ git stage a $ git commit -q -m "add lin

Re: git-cherry doesn't detect a "copied" commit

Hello Junio, On Sat, Oct 24, 2015 at 12:41 AM, Junio C Hamano wrote: > Francis Moreau writes: > >> I was mislead by the git-cherry manpage somehow which says: >> >> "git-cherry therefore >> detects when commits have been "copied" by me

git-log --cherry-pick gives different results when using tag or tag^{}

Hello, In mykernel repository, I'm having 2 different behaviours with git-log but I don't understand why: Doing: $ git log --oneline --cherry-pick --left-right v3.4.71-1^{}...next and $ git log --oneline --cherry-pick --left-right v3.4.71-1...next give something different (where v3.4.

Re: git-log --cherry-pick gives different results when using tag or tag^{}

On 01/15/2014 10:49 AM, Jeff King wrote: > [+cc Junio, as the bug blames to him] > > On Fri, Jan 10, 2014 at 02:15:40PM +0100, Francis Moreau wrote: > >> In mykernel repository, I'm having 2 different behaviours with git-log >> but I don't understand why

Transfer notes when rebasing

Hello, When rebasing a branch which contains commits with notes onto another branch it happens that some commits are already presents in the target branch. In that case git-rebase correctly drops those (already present) commits but it also drops the notes associated with them. Can the notes be t

Re: Transfer notes when rebasing

On Wed, Sep 4, 2013 at 9:59 AM, John Keeping wrote: > On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: >> On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: >> >> > When rebasing a branch which contains commits with notes onto another >>

Re: Transfer notes when rebasing

On Wed, Sep 4, 2013 at 10:28 AM, Jeff King wrote: > On Wed, Sep 04, 2013 at 08:59:41AM +0100, John Keeping wrote: > >> On Wed, Sep 04, 2013 at 03:53:10AM -0400, Jeff King wrote: >> > On Wed, Sep 04, 2013 at 09:51:26AM +0200, Francis Moreau wrote: >> > >> >

Removing all notes containing a specific string

Hello, I'd like to know if that's possible to parse all notes to detect a special string and if it's the case, remove the note like "git-notes remove" would do. Thanks -- Francis -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.o

Re: Removing all notes containing a specific string

On Fri, Sep 13, 2013 at 10:12 AM, Johan Herland wrote: > On Fri, Sep 13, 2013 at 8:51 AM, Francis Moreau > wrote: >> Hello, >> >> I'd like to know if that's possible to parse all notes to detect a >> special string and if it's the case, remove

Save notes state when releasing

Hello, I'm using notes in my project. I'm wondering if it's possible to save the state of the notes when I'm releasing/tagging a new version of my project so I can restore the saved notes state if I checkout back the old release. Therefore I would be able to inspect notes (which may have been rem

Re: Save notes state when releasing

On Fri, Sep 20, 2013 at 12:34 PM, Jeff King wrote: > On Fri, Sep 20, 2013 at 07:38:17AM +0200, Francis Moreau wrote: > >> I'm using notes in my project. I'm wondering if it's possible to save >> the state of the notes when I'm releasing/tagging a new version

git-log: --cherry-mark option and %m placeholder

Hello, When using --cherry option (which implies --cherry-mark) the mark boundaries are "+", "-", "=" when revs are displayed. But if I'm displaying them with --format=format:"%m %H", it's still using "<", ">", "=" instead. Is that expected ? Thanks -- Francis -- To unsubscribe from this list:

Question about "git log --cherry"

Hello, I'm trying to use "git log --cherry ..." in order to display new, kept and removed commits between two branches A and B. So commits which are only in B are considered new and should be marked with '+'. Commits which are in both branches are marked with '=' but only commit in branch B are s

Re: Question about "git log --cherry"

Hi, On Thu, Sep 26, 2013 at 10:21 PM, John Keeping wrote: > On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote: >> I'm trying to use "git log --cherry ..." in order to display new, kept >> and removed commits between two branches A and B. >> &

Re: Question about "git log --cherry"

On Fri, Sep 27, 2013 at 10:11 AM, John Keeping wrote: > On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: >> Hi, >> >> On Thu, Sep 26, 2013 at 10:21 PM, John Keeping wrote: >> > On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote: &g

Re: Question about "git log --cherry"

On Fri, Sep 27, 2013 at 11:14 AM, John Keeping wrote: > On Fri, Sep 27, 2013 at 10:28:05AM +0200, Francis Moreau wrote: >> On Fri, Sep 27, 2013 at 10:11 AM, John Keeping wrote: >> > On Fri, Sep 27, 2013 at 07:09:03AM +0200, Francis Moreau wrote: >> >> Hi, >>

git describe --contains --abbrev=0 doesn't work as expected

Hello, Basically doing: git describe --abbrev=0 gives the closest tag from I would expect adding "--contains" option would give the closest tag containing but it seems that --abbrev=0 has no more effect in that case: $ git describe --tags --contains --abbrev=0 7f285fa78d4b81b8458f05e77fb6b462

How to retrieve the rewritten list like the one made by git-rebase

Hello, I'd like to get a similar rewritten list than the one that git-rebase pass to the post-rewrite hook. Is there any ways to do that without using the post-rewrite hook ? Thanks -- Francis -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord..

git-remote add: --no-tags/--tags which one is the default option

Hi, git remote add has --no-tags/--tags option, but I can't find in the man page which one is the default. Could anybody tell me the default option ? Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo inf

Re: [PATCH] git-remote.txt: describe behavior without --tags and --no-tags

Hi, On 03/02/2015 02:08 PM, Michael J Gruber wrote: > Signed-off-by: Michael J Gruber > --- > Documentation/git-remote.txt | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt > index a77607b..f3f6f0d 100644 > -

Re: [PATCH] git-remote.txt: describe behavior without --tags and --no-tags

On 03/02/2015 03:48 PM, Michael J Gruber wrote: > Francis Moreau venit, vidit, dixit 02.03.2015 14:36: >> Hi, >> >> On 03/02/2015 02:08 PM, Michael J Gruber wrote: >>> Signed-off-by: Michael J Gruber >>> --- >>> Documentation/git-remote.txt |

Possible bug with git-rebase and post-rewrite hook

Hi, I have a suspect case which happens when rebasing a branch. I'm using the post-rewrite hook and during certain circumstance, my hook is called by git-rebase with wrong parameters: argument is not related to one. This actually happens when git-rebase stops and reports: The previous cherr

Re: Possible bug with git-rebase and post-rewrite hook

oops, I forgot to say that this happen with git 2.3.1. On 03/05/2015 02:55 PM, Francis Moreau wrote: > Hi, > > I have a suspect case which happens when rebasing a branch. > > I'm using the post-rewrite hook and during certain circumstance, my hook > is called by git-rebas

Re: Splitting a rev list into 2 sets

Hello Thomas, On Mon, Jun 24, 2013 at 11:59 AM, Thomas Rast wrote: > Francis Moreau writes: > >> On Thu, Jun 20, 2013 at 3:20 PM, Thomas Rast wrote: >>> positive=$(git rev-parse "$@" | grep -v '^\^') >>> negative=$(git rev-parse "$@&

Notes and submodules

Hello, Is it possible to keep submodules notes in the super project ? Thanks -- Francis -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Notes and submodules

Hello, On Mon, Aug 19, 2013 at 3:55 PM, Johan Herland wrote: > On Mon, Aug 19, 2013 at 10:13 AM, Francis Moreau > wrote: >> Hello, >> >> Is it possible to keep submodules notes in the super project ? > > Not easily. I guess it depends on what you want to use

why '--init' in git-submodule update

Hello, I'm wondering why the --init option from git-submodule-update is not at least the defaut. Or even wilder, why this option exists at all and git-submodule-update always behave like --init was always passed. Thanks -- Francis -- To unsubscribe from this list: send the line "unsubscribe git"

Re: why '--init' in git-submodule update

Hi, On Mon, Nov 5, 2012 at 10:30 PM, Heiko Voigt wrote: > Hi, > > On Mon, Nov 05, 2012 at 05:30:51PM +0100, Francis Moreau wrote: >> I'm wondering why the --init option from git-submodule-update is not >> at least the defaut. Or even wilder, why this option exists a

Re: git-describe fails with "--dirty is incompatible with committishes" if passing HEAD as argument

On Mon, Nov 19, 2012 at 8:36 PM, Junio C Hamano wrote: > Francis Moreau writes: > >> Inside the kernel repository, I tried this: >> >> $ git describe --dirty --match 'v[0-9]*' --abbrev=4 HEAD >> fatal: --dirty is incompatible with committishes >> &

Splitting a rev list into 2 sets

Hello, I'd like to write a script that would parse commits in one of my repo. Ideally this script should accept any revision ranges that git-rev-list would accept. This script should consider commits in master differently than the ones in others branches. To get the commit set which can't be rea

Re: Splitting a rev list into 2 sets

On Thu, Jun 20, 2013 at 1:26 PM, Ramkumar Ramachandra wrote: > Francis Moreau wrote: >> To get the commit set which can't be reached by master (ie commits >> which are specific to branches other than master) I would do: >> >> # "$@" is the range s

Re: Splitting a rev list into 2 sets

Hi, On Thu, Jun 20, 2013 at 3:04 PM, Phil Hord wrote: > On Thu, Jun 20, 2013 at 6:14 AM, Francis Moreau > wrote: >> I'd like to write a script that would parse commits in one of my repo. >> Ideally this script should accept any revision ranges that >> git-rev-

Re: Splitting a rev list into 2 sets

Hi, On Thu, Jun 20, 2013 at 3:20 PM, Thomas Rast wrote: > Francis Moreau writes: >> >> But I'm wondering if someone can see another solution more elegant ? > > I think there's a cute way. Suppose your arguments are of the form Really nice ! > > p1 p2 ..

Re: Splitting a rev list into 2 sets

Hi, On Thu, Jun 20, 2013 at 3:47 PM, Ramkumar Ramachandra wrote: > Francis Moreau wrote: >> Basically I have an initial set (or can be several different sets) >> expressed as a revision specification described by git-rev-list man >> page. I just want to find the common se

git submodule summary doesn't return an error when passed a wrong commit/rev

Hi, it seems to me that when passed an unknown rev or a wrong commit/sha1, git-submodule-summary should at least exit with an error status. Even better would be a error output. Test was done with git version 1.7.10.4 from debian wheezy. Thanks -- Francis -- To unsubscribe from this list: send t

Re: Can't understand the behaviour of git-diff --submodule

Hi, Thanks for answering On Fri, Oct 26, 2012 at 9:08 PM, Jens Lehmann wrote: > Am 26.10.2012 16:07, schrieb Francis Moreau: >> I'm trying to use the --submodule switch with git-diff but doesnt >> understand the following behaviour: >> >> $ git diff 2c9a257718d18

Re: git submodule summary doesn't return an error when passed a wrong commit/rev

On Fri, Oct 26, 2012 at 9:53 PM, Jens Lehmann wrote: > Am 26.10.2012 16:03, schrieb Francis Moreau: >> it seems to me that when passed an unknown rev or a wrong commit/sha1, >> git-submodule-summary should at least exit with an error status. Even better >> would be a error o

Re: Can't understand the behaviour of git-diff --submodule

On Fri, Oct 26, 2012 at 10:05 PM, Jens Lehmann wrote: [...] > > That is weird, "git diff --submodule" should show that too. Is there > anything unusual about your setup? (The only explanation I can come > up with after checking the code is that your submodule has neither a > .git directory nor a g

Re: Can't understand the behaviour of git-diff --submodule

On Sun, Oct 28, 2012 at 1:02 AM, Jens Lehmann wrote: > Am 26.10.2012 22:43, schrieb Francis Moreau: >> On Fri, Oct 26, 2012 at 10:05 PM, Jens Lehmann wrote: >> [...] >>> >>> That is weird, "git diff --submodule" should show that too. Is there >&

Why does git-commit --template want the template to be modified ?

Hi, I'm using git-commit with the --template option. The template I'm given is self sufficient for my purpose but as stated in the documentation, git-commit wants the template to be edited otherwise it aborts the operation. Is it possible to change this ? Thanks -- Francis -- To unsubscribe fro

Re: Why does git-commit --template want the template to be modified ?

Hi, On Tue, Oct 30, 2012 at 12:09 PM, Tomas Carnecky wrote: > On Tue, 30 Oct 2012 11:53:08 +0100, Francis Moreau > wrote: >> Hi, >> >> I'm using git-commit with the --template option. The template I'm >> given is self sufficient for my purpose but as st

Re: Can't understand the behaviour of git-diff --submodule

Hi, On Tue, Oct 30, 2012 at 10:17 PM, Jens Lehmann wrote: > Am 28.10.2012 01:02, schrieb Jens Lehmann: >> Am 26.10.2012 22:43, schrieb Francis Moreau: >>> On Fri, Oct 26, 2012 at 10:05 PM, Jens Lehmann wrote: >>> [...] >>>> >>>> That is wei

Adding "--ignore-submodules" switch to git-describe

Hello, Would it make sense to add the option --ignore-submodules (currently available in git-status) to git-describe when the later is used with --dirty option ? Thanks -- Francis -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.

Re: Adding "--ignore-submodules" switch to git-describe

Hi, Sorry for the long delay, I somehow missed your answer... On Fri, Mar 1, 2013 at 6:46 PM, Junio C Hamano wrote: > Francis Moreau writes: > >> Would it make sense to add the option --ignore-submodules (currently >> available in git-status) to git-describe when the