year
But I'd like to know 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
Hi,
Le vendredi 07 mars 2014 à 11:43 -0800, Junio C Hamano a écrit :
> Andreas Schwab writes:
>
> > Yann Droneaud writes:
> >
> >> But I'd like to know if there's a specific reason for git merge to not
> >> support --date and --author ?
> >
..
To achieve what I intend to do with this option, a git repack would need
to be issued to actually
copy the objects from the --reference .
So what's the best way to do a git fetch , copying objects from
another local repository
to resolve delta ?
Regards.
--
Yann Droneaud
OPTEYA
--
T
CRLF EOL while the added line
have LF line ending characters.
Tested-By: Yann Droneaud
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.kerne
s not always report the CRLF/LF 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
--
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
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
Hi,
Le 24.06.2013 18:55, Junio C Hamano a écrit :
Yann Droneaud 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
diff would say &qu
://article.gmane.org/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
t
--
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
it tag downstream-default-3
# now, try a different merge strategy
git checkout master
git branch -D downstream
git branch downstream master
git checkout downstream
git merge --no-edit --no-ff --strategy-option theirs upstream-1-fix
git tag downstream-theirs-1
git merge --no-edit --no-ff --stra
5-1-git-send-email-ydrone...@opteya.com>
2. <http://thread.gmane.org/gmane.comp.version-control.git/227466>
<http://marc.info/?l=git&m=137097069115462&w=2>
3. https://www.kernel.org/pub/software/scm/git/docs/git-config.html
--
Yann Droneaud
OPTEYA
--
To unsubscribe from this list:
35-1-git-send-email-ydrone...@opteya.com>
2. <http://thread.gmane.org/gmane.comp.version-control.git/227466>
<http://marc.info/?l=git&m=137097069115462&w=2>
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
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 r
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
---
t/t0020-crlf.sh | 52
1 file changed, 52 insertions(+)
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index
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"
<http://thread.gmane.org/gmane.comp.version-control.git/228613>
<http://marc.info/?l=git&m=137182211414404&w=
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.
Wh
tches 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
t340
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud
---
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
--- a/t/t4018-diff
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud
---
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/t/t7810-grep.sh
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t3400-rebase.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletion
The latter doesn't failed if 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
---
t/t4202-log.sh | 28
1 file changed, 8 in
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t7508-status.sh | 46
test_config is provided by the test library,
a private version is not needed.
Signed-off-by: Yann Droneaud
---
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-grep-open.sh
+++ b
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t5541-http-push.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletion
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t9500-gitweb-standalone-no-errors.sh | 3 +--
1 file changed, 1 inser
figuration variables at the end.
Signed-off-by: Yann Droneaud
---
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-rebase-interactive.sh
+++ b/t/t3
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t7502-commit.sh | 8 +++-
1 file changed, 3 insertions(+), 5
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t7500-commit.sh | 6 ++
1 file changed, 2 insertions(+), 4
The latter doesn't failed if is not defined.
Signed-off-by: Yann Droneaud
---
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-diff-words.sh
++
Instead of using construct such as:
test_when_finished "git config --unset "
git config
uses
test_config
The latter takes care of removing at the end of the test.
Signed-off-by: Yann Droneaud
---
t/t5520-pull.sh | 12
1 file changed, 4 insertions(+), 8
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
---
t/t7502-commit.sh | 32 ++--
1 file changed, 6 insertions(+), 26 dele
out `--no-ff` option.
Signed-off-by: Yann Droneaud
---
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-merge.sh
+++ b/t/t7600-mer
Hi,
Le 27.03.2013 16:05, Junio C Hamano a écrit :
Yann Droneaud 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?
Yes, grep'ing
the behavior rather good.
Merging a tag object by its name or by its object-id are now using the
same behavor: it is more consistent.
Tested-by: Yann Droneaud
PS: there's a typo in the commit title :)
Regards.
--
Yann Droneaud
OPTEYA
--
To unsubscribe from this list: send the
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
OPTEY
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 cal
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
---
block-sha1/sha1.c | 4 ++--
1 file changed, 2 inser
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
---
block-sha1/sha1.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block-sha1/sha1.h b/block
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
---
block-sha1/sha1.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block-sha
Le mercredi 12 septembre 2012 à 11:42 -0700, Junio C Hamano a écrit :
> Yann Droneaud 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 integer
Le mercredi 12 septembre 2012 à 11:37 -0700, Junio C Hamano a écrit :
> Yann Droneaud writes:
>
> > 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 + offse
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
>
lk_SHA_CTX *ctx, const void
*data, unsigned long len)
unsigned int left = 64 - lenW;
if (len < left)
left = len;
- memcpy((char *)ctx->W + lenW, data, left);
+ memcpy(ctx->W + lenW, data, left);
ultiple repository tool
http://code.google.com/p/git-repo/
[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-info.html
umented as an exception of "FAST-FORWARD MERGE" section
and "--ff" option description.
Signed-off-by: Yann Droneaud
---
Documentation/git-merge.txt | 9 +
Documentation/merge-options.txt | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a
Hi,
Le mardi 19 mars 2013 à 09:19 -0700, Junio C Hamano a écrit :
> Yann Droneaud writes:
>
> > 1) there's no mention of the git merge behavior in git-merge.1
> Yes; we welcome documentation patches.
>
Sent.
> > 2) git merge VS git merge
> >
>
Hi,
Le mercredi 20 mars 2013 à 19:04 +0100, Yann Droneaud a écrit :
> > > 2) git merge VS git merge
> > >
> > > If is an object (not a lightweight/reference tag), git merge
> > > ...
> > > But, if you use the tag object-id instead of its name, for
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
---
Documentation/README | 13 +
1 file changed, 13 insertions(+)
create mode
Le 21.03.2013 16:31, Junio C Hamano a écrit :
Yann Droneaud 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 not deserve a *new* file
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 insertions(+)
ge.txt.
It should be documented as an exception of "FAST-FORWARD MERGE" section
and "--ff" option description.
Reviewed-by: Jonathan Nieder
Reviewed-by: Yann Droneaud
---
Documentation/git-merge.txt | 24
Documentation/merge-options.txt | 3 ++-
Le jeudi 21 mars 2013 à 10:39 -0700, Junio C Hamano a écrit :
> Yann Droneaud 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.
&
rule as for code applies -- imitate the existing
> 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 t
Hi,
Le 21.03.2013 21:31, Max Nanasy a écrit :
Yann Droneaud 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-o
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
---
t/t7600-merge.sh
ng at failing. And it's making me
angry.
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
57 matches
Mail list logo
