git merge --date --author

if there's a specific reason for git merge to not support --date and --author ? Regards. -- Yann Droneaud OPTEYA -- 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: git merge --date --author

Hi, Le vendredi 07 mars 2014 à 11:43 -0800, Junio C Hamano a écrit : Andreas Schwab sch...@linux-m68k.org writes: Yann Droneaud ydrone...@opteya.com writes: But I'd like to know if there's a specific reason for git merge to not support --date and --author ? It's rather unusual

git fetch --reference

another local repository to resolve delta ? Regards. -- Yann Droneaud OPTEYA -- 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

[PATCH 0/3] Janitor minor fixes on SHA1

While looking to use the git SHA1 code, I've found some small oddities. Please find little cosmetics fixes for them. The patches are against 'next' and can be merged in one single patch if needed. Yann Droneaud (3): sha1: update pointer and remaining length after subfunction call sha1: clean

[PATCH 1/3] sha1: update pointer and remaining length after subfunction call

There's no need to update the pointer and remaining length before leaving or calling the SHA1 sub function. Additionnaly, the partial block code could be looking more like the full block handling branch. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- block-sha1/sha1.c | 4 ++-- 1 file

[PATCH 3/3] sha1: use char type for temporary work buffer

The SHA context is holding a temporary buffer for partial block. This block must 64 bytes long. It is currently described as an array of 16 integers. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- block-sha1/sha1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block

[PATCH 2/3] sha1: clean pointer arithmetic

One memcpy() argument is computed from a pointer added to an integer: eg. int + pointer. It's unusal. Let's write it in the correct order: pointer + offset. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- block-sha1/sha1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH 3/3] sha1: use char type for temporary work buffer

Le mercredi 12 septembre 2012 à 11:42 -0700, Junio C Hamano a écrit : Yann Droneaud ydrone...@opteya.com writes: The SHA context is holding a temporary buffer for partial block. This block must 64 bytes long. It is currently described as an array of 16 integers. Signed-off-by: Yann

Re: [PATCH 3/3] sha1: use char type for temporary work buffer

Le mercredi 12 septembre 2012 à 14:38 -0400, Jeff King a écrit : On Wed, Sep 12, 2012 at 12:30:45PM +0200, Yann Droneaud wrote: The SHA context is holding a temporary buffer for partial block. This block must 64 bytes long. It is currently described as an array of 16 integers

Re: [PATCH 3/3] sha1: use char type for temporary work buffer

; if (lenW) Regards. -- Yann Droneaud OPTEYA -- 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: override merge.ff = false using --ff-only

/gmane.comp.version-control.git/218519 http://article.gmane.org/gmane.comp.version-control.git/218755 http://article.gmane.org/gmane.comp.version-control.git/218786 Regards. -- Yann Droneaud OPTEYA -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Tracking vendor release with Git

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

Tracking vendor release with Git

match # but have a different commit message: # no conflict reported for theirs git diff downstream-default-3 downstream-theirs-3 # Regards ! -- Yann Droneaud ydrone...@opteya.com OPTEYA -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

git diff returns fatal error with core.safecrlf is set to true.

-control.git/227466 http://marc.info/?l=gitm=137097069115462w=2 3. https://www.kernel.org/pub/software/scm/git/docs/git-config.html -- Yann Droneaud OPTEYA -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

git rebase fail with CRLF conversion

: - a shell script to demonstrate the behavor - a patch to t0020-crlf.sh to add two rebase tests. 1. 1370970410-7935-1-git-send-email-ydrone...@opteya.com 2. http://thread.gmane.org/gmane.comp.version-control.git/227466 http://marc.info/?l=gitm=137097069115462w=2 Regards -- Yann Droneaud OPTEYA

Re: git rebase fail with CRLF conversion

Hi, Le 21.06.2013 15:41, Yann Droneaud a écrit : I believe git rebase should not fail here, but more, it must not fail in a different fashion randomly. Please find in reply to this email: - a shell script to demonstrate the behavor Please find a shell script to test git rebase

[PATCH] t0020-crlf: test rebase with text conversion and safecrlf

. git diff will also fail when core.safecrlf is set to true and the file is not already converted to LF. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t0020-crlf.sh | 52 1 file changed, 52 insertions(+) diff --git a/t/t0020-crlf.sh

Re: [PATCH] t0020-crlf: test rebase with text conversion and safecrlf

Le 21.06.2013 16:15, Yann Droneaud a écrit : This patch add two tests to reproduce the problems described in thread git rebase fail with CRLF conversion fb20a7d711fdd218f58f1f2090b1c...@meuh.org http://thread.gmane.org/gmane.comp.version-control.git/228613 http://marc.info/?l=gitm

Re: git rebase fail with CRLF conversion

Le 21.06.2013 15:41, Yann Droneaud a écrit : In thoses two latter cases, running git add does not fail with a fatal error: it does nothing. I need to run touch test to make git add fail with error fatal: CRLF would be replaced by LF in test. While searching on the Internet, I've found other

Re: git diff returns fatal error with core.safecrlf is set to true.

lines have CRLF EOL while the added line have LF line ending characters. Tested-By: Yann Droneaud ydrone...@opteya.com Regards. -- Yann Droneaud OPTEYA -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Another core.safecrlf behavor with git diff/git status

mismatch ? - Why git status does not report about the CRLF/LF mismatch before updating the index: it silently hide the CRLF/LF warning. git add, git commit report the warning. git status should probably do the same. Regards. -- Yann Droneaud OPTEYA -- To unsubscribe from this list: send

Re: Another core.safecrlf behavor with git diff/git status

Le 24.06.2013 18:37, Yann Droneaud a écrit : I'm still trying to use .gitattributes text flag with CRLF line ending files under Linux. I'm surprised about the interaction between the index and the working directory, more specificaly about the interaction between git diff and git status

Re: Another core.safecrlf behavor with git diff/git status

Le 24.06.2013 18:37, Yann Droneaud a écrit : I'm still trying to use .gitattributes text flag with CRLF line ending files under Linux. I'm surprised about the interaction between the index and the working directory, more specificaly about the interaction between git diff and git status

Re: Another core.safecrlf behavor with git diff/git status

Hi, Le 24.06.2013 18:55, Junio C Hamano a écrit : Yann Droneaud ydrone...@opteya.com writes: - Why git diff does not always report the CRLF/LF mismatch ? Most likely because you are telling safecrlf not to error out but just warn, and then you are not fixing the cause of the warning? So

git merge tag behavior

/ [4] git-merge(1) Manual Page https://www.kernel.org/pub/software/scm/git/docs/git-merge.html -- Yann Droneaud OPTEYA -- 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

[PATCH] Documentation: merging a tag is a special case

as an exception of FAST-FORWARD MERGE section and --ff option description. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- Documentation/git-merge.txt | 9 + Documentation/merge-options.txt | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Documentation/git

Re: git merge tag behavior

Hi, Le mardi 19 mars 2013 à 09:19 -0700, Junio C Hamano a écrit : Yann Droneaud ydrone...@opteya.com writes: 1) there's no mention of the git merge tag behavior in git-merge.1 Yes; we welcome documentation patches. Sent. 2) git merge tag VS git merge object-id If tag is an object

Re: git merge tag behavior

Hi, Le mercredi 20 mars 2013 à 19:04 +0100, Yann Droneaud a écrit : 2) git merge tag VS git merge object-id If tag is an object (not a lightweight/reference tag), git merge tag ... But, if you use the tag object-id instead of its name, for example using git merge `git parse-rev

[PATCH] Documentation: add a README file

The documentation is in AsciiDoc format: it should be written somewhere with links to AsciiDoc documentation so that it became easy to find how to write documentation for Git. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- Documentation/README | 13 + 1 file changed, 13

Re: [PATCH] Documentation: add a README file

Le 21.03.2013 16:31, Junio C Hamano a écrit : Yann Droneaud ydrone...@opteya.com writes: The documentation is in AsciiDoc format: it should be written somewhere with links to AsciiDoc documentation so that it became easy to find how to write documentation for Git. Certainly this does

Re: [PATCH] Documentation: merging a tag is a special case

Hi, Just a little change I made on my own. The other part are definitely better than my version, so I propose to merge all the patches in the thread with you as author, putting Jonathan Nieder and myself as reviewers. Regards Documentation/git-merge.txt | 4 ++-- 1 file changed, 2

[PATCH v2] Documentation: merging a tag is a special case

in git-merge.txt. It should be documented as an exception of FAST-FORWARD MERGE section and --ff option description. Reviewed-by: Jonathan Nieder jrnie...@gmail.com Reviewed-by: Yann Droneaud ydrone...@opteya.com --- Documentation/git-merge.txt | 24 Documentation/merge

Re: [PATCH] Documentation: add a README file

Le jeudi 21 mars 2013 à 10:39 -0700, Junio C Hamano a écrit : Yann Droneaud ydrone...@opteya.com writes: There were no indication about how to write documentation in SubmittingPatches. I would agree that is probably the right place for it if we were to add insns/hints

Re: [PATCH] Documentation: add a README file

conventions. A few commented examples follow to provide reference Nice, I'm OK with this change. (But still thinking a README would be useful *too*). Regards. -- Yann Droneaud OPTEYA -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: git merge tag behavior

Hi, Le 21.03.2013 21:31, Max Nanasy a écrit : Yann Droneaud ydroneaud at opteya.com writes: 3) Merge options can't be overridden. If I modify .git/config to set a merge option, for example forcing fast-forward merge, this option cannot be overridden on command line: (git merge --no-ff

[PATCH] t7600: test merge configuration override

Set the configuration variable 'merge.ff' to either 'only' or 'no' and check that this configuration can be overridden on command line. Additionally, test for currently not tested option '--no-ff-only' Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7600-merge.sh | 26

Re: [PATCH] t7600: merge tag shoud create a merge commit

. Regards. -- Yann Droneaud OPTEYA -- 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

[PATCH 00/15] Use test_config

are fairly simple. Testsuite results are the same after the patches. Tested against master, 7b592fadf1e23b10b913e0771b9f711770597266 Yann Droneaud (15): t4018: remove test_config implementation t7810: remove test_config implementation t7811: remove test_config implementation t3400: use

[PATCH 01/15] t4018: remove test_config implementation

test_config is provided by the test library, a private version is not needed. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t4018-diff-funcname.sh | 5 - 1 file changed, 5 deletions(-) diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 082d3e8..38a092a 100755

[PATCH 02/15] t7810: remove test_config implementation

test_config is provided by the test library, a private version is not needed. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7810-grep.sh | 5 - 1 file changed, 5 deletions(-) diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index f698001..500eb50 100755 --- a/t/t7810-grep.sh +++ b

[PATCH 04/15] t3400: use test_config to set/unset git config variables

Instead of using construct such as: test_when_finished git config --unset key git config key value uses test_config key value The latter takes care of removing key at the end of the test. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t3400-rebase.sh | 3 +-- 1 file changed

[PATCH 07/15] t4202: use test_config/test_unconfig to set/unset git config variables

test_unconfig key The latter doesn't failed if key is not defined. Tests are modified to assume correct (default) configuration at entry, and to reset the modified configuration variables at the end. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t4202-log.sh | 28 1

[PATCH 12/15] t7508: use test_config to set/unset git config variables

Instead of using construct such as: test_when_finished git config --unset key git config key value uses test_config key value The latter takes care of removing key at the end of the test. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7508-status.sh | 46

[PATCH 03/15] t7811: remove test_config implementation

test_config is provided by the test library, a private version is not needed. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7811-grep-open.sh | 5 - 1 file changed, 5 deletions(-) diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh index a895778..e1951a5 100755 --- a/t/t7811

[PATCH 09/15] t5541: use test_config to set/unset git config variables

Instead of using construct such as: test_when_finished git config --unset key git config key value uses test_config key value The latter takes care of removing key at the end of the test. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t5541-http-push.sh | 3 +-- 1 file

[PATCH 14/15] t9500: use test_config to set/unset git config variables

Instead of using construct such as: test_when_finished git config --unset key git config key value uses test_config key value The latter takes care of removing key at the end of the test. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t9500-gitweb-standalone-no-errors.sh | 3

[PATCH 05/15] t4304: use test_config to set/unset git config variables

configuration variables at the end. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t3404-rebase-interactive.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 15dcbd4..a58406d 100755 --- a/t/t3404

[PATCH 11/15] t7502: use test_config to set/unset git config variables

Instead of using construct such as: test_when_finished git config --unset key git config key value uses test_config key value The latter takes care of removing key at the end of the test. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7502-commit.sh | 8 +++- 1 file

[PATCH 10/15] t7500: use test_config to set/unset git config variables

Instead of using construct such as: test_when_finished git config --unset key git config key value uses test_config key value The latter takes care of removing key at the end of the test. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7500-commit.sh | 6 ++ 1 file

[PATCH 06/15] t4034: use test_config/test_unconfig to set/unset git config variables

test_unconfig key The latter doesn't failed if key is not defined. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t4034-diff-words.sh | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 40ab333..f2f55fc 100755 --- a/t/t4034

[PATCH 08/15] t5520: use test_config to set/unset git config variables

Instead of using construct such as: test_when_finished git config --unset key git config key value uses test_config key value The latter takes care of removing key at the end of the test. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t5520-pull.sh | 12 1 file

[PATCH 15/15] t7502: remove clear_config

Using test_config ensure the configuration variable are removed at the end of the test, there's no need to remove variable at the beginning of the test. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7502-commit.sh | 32 ++-- 1 file changed, 6 insertions

[PATCH 13/15] t7600: use test_config to set/unset git config variables

`--no-ff` option. Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7600-merge.sh | 60 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 5e19598..2f70433 100755 --- a/t/t7600

Re: [PATCH 00/15] Use test_config

Hi, Le 27.03.2013 16:05, Junio C Hamano a écrit : Yann Droneaud ydrone...@opteya.com writes: Tested against master, 7b592fadf1e23b10b913e0771b9f711770597266 Is this because I suggested you to clean things up while you were touching in a vicinity of something that could use this clean-up

Re: [PATCH 1/3] merge: a random object may not necssarily be a commit

object-id are now using the same behavor: it is more consistent. Tested-by: Yann Droneaud ydrone...@opteya.com PS: there's a typo in the commit title :) Regards. -- Yann Droneaud OPTEYA -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH] git-tag(1): we tag HEAD by default

to tag a file git tag -a -m tagged a file test_tag_file `git ls-tree HEAD | awk '{ print $3; exit; }'` git show test_tag_file git show -p test_tag_file Is there any other kind of object that can be tagged ... and what is the purpose of this ? Regards. -- Yann Droneaud OPTEYA