Read trailers from a file or from stdin, parse the trailers and then
put the result into a doubly linked list.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
trailer.c | 123
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
t/t7513-interpret-trailers.sh | 738 ++
1 file changed, 738 insertions(+)
create mode 100755 t/t7513-interpret-trailers.sh
diff --git a/t/t7513
Let the user specify a command that will give on its standard output
the value to use for the specified trailer.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
trailer.c | 85
While at it add git-interpret-trailers to command-list.txt.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Documentation/git-interpret-trailers.txt | 314 +++
command-list.txt | 1
This patch adds the git interpret-trailers command.
This command uses the previously added process_trailers()
function in trailer.c.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Junio C Hamano gits...@pobox.com
---
.gitignore | 1 +
Makefile
From: Junio C Hamano gits...@pobox.com
Christian Couder christian.cou...@gmail.com writes:
On Sun, Oct 12, 2014 at 11:36 AM, Christian Couder
christian.cou...@gmail.com wrote:
With v16 you can easily choose if you want to have the S-o-b in the
output or not, when there is already one
Hi,
On Sat, Oct 25, 2014 at 2:31 PM, Henning Moll newssc...@gmx.de wrote:
Hi,
suppose the following history
P - - - Q - - - - - R -extern
A -- - B - - - C - D - - - E -master
\ \
M ... \ -b1
\
On Sun, Oct 26, 2014 at 4:19 PM, Andreas Schwab sch...@linux-m68k.org wrote:
Henning Moll newssc...@gmx.de writes:
1. For P, A is the nearest prior commit on 'master'
2. on master: git rebase -i A^
3. change A from pick to edit. save. quit
4. git merge P
5. git rebase --continue
From the
On Mon, Oct 27, 2014 at 6:32 PM, Junio C Hamano gits...@pobox.com wrote:
Jeff King p...@peff.net writes:
If that is the only casualty, I think it is probably a net-win. We may
want better tooling around viewing the merge later, but that can wait
until somebody steps up with a real use case
Hi,
On Thu, Oct 30, 2014 at 4:39 PM, Dmitry Oksenchuk oksenchu...@gmail.com wrote:
Hello,
We're in the middle of conversion of a large CVS repository (20 years,
70K commits, 1K branches, 10K tags) to Git and considering two
separate Git repositories: historical with CVS history and working
Hi Dmitry,
On Thu, Oct 30, 2014 at 6:41 PM, Dmitry Oksenchuk oksenchu...@gmail.com wrote:
2014-10-30 19:54 GMT+03:00 Christian Couder christian.cou...@gmail.com:
This might be a good idea. Did you already test that the small
repository is really faster than the full repository?
Yes, because
Hi Dmitry,
On Fri, Oct 31, 2014 at 4:47 PM, Dmitry Oksenchuk oksenchu...@gmail.com wrote:
Hi Christian,
On Thu, Oct 30, 2014 at 6:41 PM, Dmitry Oksenchuk oksenchu...@gmail.com
wrote:
Yes, because of such amount of refs, push in historical repository
takes 12 sec, push in working
From: Alexander Shopov a...@kambanaria.org
Can you please disambiguate message:
msgid more than one %s
It means that something somewhere was repeated but does not point what
and where. Perhaps users care about that.
If you configure something like:
[trailer stuff]
key = Stuff
Make sure we look for trailers before any conflict line
by reusing the ignore_non_trailer() function.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t7513-interpret-trailers.sh | 2 ++
trailer.c | 25 ++---
2 files changed, 20 insertions
Otherwise trailers that are commented out might be
processed. We would also error out if the comment line
char is also a separator.
This means that comments inside a trailer block will
disappear, but that was already the case anyway.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/commit.c | 46 --
commit.c | 46 ++
commit.h | 3 +++
3 files changed, 49 insertions(+), 46 deletions(-)
diff --git
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t7513-interpret-trailers.sh | 32 +++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index fed053a..bd0ab46 100755
--- a/t/t7513
' on 2014-10-29 at 693250f)
Christian Couder (5):
trailer: ignore comment lines inside the trailers
trailer: display a trailer without its trailing newline
commit: make ignore_non_trailer() non static
trailer: reuse ignore_non_trailer() to ignore conflict lines
trailer: add test
Trailers passed to the parse_trailer() function have
a trailing newline. When erroring out, we should display
the invalid trailer properly, that means without any
trailing newline.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
trailer.c | 8 ++--
1 file changed, 6 insertions
' on 2014-10-29 at 693250f)
Changes since the previous version are:
* use %.*s instead of a strbuf, in patch 2/5
* add new find_trailer_end() function and a call to strbuf_release(),
in patch 4/5
Thanks to Junio and Peff.
Christian Couder (5):
trailer: ignore comment lines inside
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t7513-interpret-trailers.sh | 32 +++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index fed053a..bd0ab46 100755
--- a/t/t7513
Trailers passed to the parse_trailer() function often have
a trailing newline. When erroring out, we should display
the invalid trailer properly, that means without any
trailing newline.
Helped-by: Junio C Hamano gits...@pobox.com
Helped-by: Jeff King p...@peff.net
Signed-off-by: Christian Couder
Make sure we look for trailers before any conflict line
by reusing the ignore_non_trailer() function.
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t7513-interpret-trailers.sh | 2 ++
trailer.c | 32
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/commit.c | 46 --
commit.c | 46 ++
commit.h | 3 +++
3 files changed, 49 insertions(+), 46 deletions(-)
diff --git
Otherwise trailers that are commented out might be
processed. We would also error out if the comment line
char is also a separator.
This means that comments inside a trailer block will
disappear, but that was already the case anyway.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH 4/5] trailer: reuse ignore_non_trailer() to ignore conflict
lines
Date: Fri, 07 Nov 2014 12:27:03 -0800
Christian Couder chrisc...@tuxfamily.org writes:
* Copyright (c) 2013, 2014 Christian Couder chrisc...@tuxfamily.org
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH v2 4/5] trailer: reuse ignore_non_trailer() to ignore
conflict lines
Date: Mon, 10 Nov 2014 09:49:34 -0800
Christian Couder chrisc...@tuxfamily.org writes:
Make sure we look for trailers before any conflict line
by reusing
-by: Christian Couder chrisc...@tuxfamily.org
---
If this patch is considered useful, I will update the doc and
maybe add tests.
builtin/replace.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/builtin/replace.c b/builtin/replace.c
index 59d3115..0246ab3 100644
--- a/builtin/replace.c
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 13 +
1 file changed, 13 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index decdc33..8f631ac 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -263,4 +263,17
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 8f631ac..4807689 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -276,4 +276,10 @@ test_expect_success
16 commit
04 tree
(these are the only valid modes)
* Blobs don't point at anything.
The doc will be updated in a later patch.
Acked-by: Philip Oakley philipoak...@iee.org
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 10
There were no hints in the documentation about how to create
replacement objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 16
1 file changed, 16 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git
A previous patch ensures that both the replaced and the replacement
objects passed to git replace must be of the same type.
While at it state that there is no other restriction on both objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 7
we discussed about creating replacement objects (5/5).
Christian Couder (5):
replace: forbid replacing an object with one of a different type
Documentation/replace: state that objects must be of the same type
t6050-replace: test that objects are of the same type
t6050-replace: add test
From: Johannes Sixt j...@kdbg.org
Am 25.08.2013 15:06, schrieb Christian Couder:
@@ -100,6 +101,15 @@ static int replace_object(const char *object_ref, const
char *replace_ref,
if (check_refname_format(ref, 0))
die('%s' is not a valid ref name., ref);
+obj_type
From: Johannes Sixt j...@kdbg.org
Am 25.08.2013 21:44, schrieb Christian Couder:
What about:
die(Objects must be of the same type.\n
'%s' points to a replaced object of type '%s'\n
while '%s' points to a replacement object of type '%s
16 commit
04 tree
(these are the only valid modes)
* Blobs don't point at anything.
The doc will be updated in a later patch.
Acked-by: Philip Oakley philipoak...@iee.org
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 10
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 5c352c4..05be228 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -276,4 +276,10 @@ test_expect_success
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 13 +
1 file changed, 13 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index decdc33..5c352c4 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -263,4 +263,17
There were no hints in the documentation about how to create
replacement objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 16
1 file changed, 16 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git
A previous patch ensures that both the replaced and the replacement
objects passed to git replace must be of the same type.
While at it state that there is no other restriction on both objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 7
. instead of '\''
Only patchs 1/5 and 3/5 were changed.
Christian Couder (5):
replace: forbid replacing an object with one of a different type
Documentation/replace: state that objects must be of the same type
t6050-replace: test that objects are of the same type
t6050-replace: add test
From: Junio C Hamano gits...@pobox.com
Thomas Rast tr...@inf.ethz.ch writes:
Hrm, you're right, that's a flaw in my logic. You could do the same in
all other cases too, e.g. replace a tree so that an entry is of a
different type and at the same time change the type of the object
itself.
From: Junio C Hamano gits...@pobox.com
Christian Couder chrisc...@tuxfamily.org writes:
But if all the objects that point to an object, called O, are to be
replaced, then in most cases object O probably doesn't need to be
replaced. It's probably sufficient to create the new object, called
There were no hints in the documentation about how to create
replacement objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 16
1 file changed, 16 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git
adding long option names
Christian Couder (11):
replace: forbid replacing an object with one of a different type
Documentation/replace: state that objects must be of the same type
t6050-replace: test that objects are of the same type
t6050-replace: add test to clean up all the replace refs
-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/builtin/replace.c b/builtin/replace.c
index 59d3115..9a94769 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -85,6 +85,7 @@ static int replace_object(const char
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 13 +
1 file changed, 13 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index decdc33..5c352c4 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -263,4 +263,17
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 5c352c4..05be228 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -276,4 +276,10 @@ test_expect_success
A previous patch ensures that both the replaced and the replacement
objects passed to git replace must be of the same type.
While at it state that there is no other restriction on both objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 7
If -f option, which means '--force', is used, we can allow an object
to be replaced with one of a different type, as the user should know
what (s)he is doing.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 05be228..0b07a0b 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -276,6 +276,12 @@ test_expect_success
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index a2bd2ee..414000e 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git
So that they are tested a litlle bit too.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 0b07a0b..5dc26e8 100755
--- a/t/t6050-replace.sh
It is now standard practice in Git to have both short and long option
names. So let's give a long option name to the git replace options too.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 736b48c..a2bd2ee 100644
--- a/Documentation/git-replace.txt
+++ b
From: Eric Sunshine sunsh...@sunshineco.com
On Sat, Aug 31, 2013 at 3:12 PM, Christian Couder
chrisc...@tuxfamily.org wrote:
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6050-replace.sh b/t
From: Philip Oakley philipoak...@iee.org
So that they are tested a litlle bit too.
s /litlle/little/
Thanks,
Christian.
--
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
From: Philip Oakley philipoak...@iee.org
From: Christian Couder chrisc...@tuxfamily.org
+CREATING REPLACEMENT OBJECTS
+
+
+linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and
+linkgit:git-rebase[1],
Let's not forget the obvious 'git commit' or 'git
From: Philip Oakley philipoak...@iee.org
From: Christian Couder chrisc...@tuxfamily.org
The replaced object and the replacement object must be of the same
type.
-There is no other restriction on them.
+This restriction can be bypassed using `-f`.
Unless `-f` is given, the 'replace
From: Philip Oakley philipoak...@iee.org
Sorry for not replying earlier in the series.
From: Christian Couder chrisc...@tuxfamily.org
Users replacing an object with one of a different type were not
prevented to do so, even if it was obvious, and stated in the doc,
that bad things would
The only changes in this new version are:
- removed useless redirections in 8/11
- improved commit message in 11/11 (s/litlle/little/)
I may add examples and more in a new patch series later.
Christian Couder (11):
replace: forbid replacing an object with one of a different
-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/builtin/replace.c b/builtin/replace.c
index 59d3115..9a94769 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -85,6 +85,7 @@ static int replace_object(const char
A previous patch ensures that both the replaced and the replacement
objects passed to git replace must be of the same type.
While at it state that there is no other restriction on both objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 7
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 05be228..622b751 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -276,6 +276,12 @@ test_expect_success
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 13 +
1 file changed, 13 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index decdc33..5c352c4 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -263,4 +263,17
It is now standard practice in Git to have both short and long option
names. So let's give a long option name to the git replace options too.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
If -f option, which means '--force', is used, we can allow an object
to be replaced with one of a different type, as the user should know
what (s)he is doing.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff
So that they are tested a little bit too.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 622b751..1fe5c1b 100755
--- a/t/t6050-replace.sh
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index a2bd2ee..414000e 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 736b48c..a2bd2ee 100644
--- a/Documentation/git-replace.txt
+++ b
There were no hints in the documentation about how to create
replacement objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 16
1 file changed, 16 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 5c352c4..05be228 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -276,4 +276,10 @@ test_expect_success
On Mon, Sep 2, 2013 at 11:50 PM, Philip Oakley philipoak...@iee.org wrote:
From: Christian Couder chrisc...@tuxfamily.org
You mean something like the following:
$ cat ./graft2replace.sh
#!/bin/bash
while read orig parents
do
printf %s git cat-file commit $orig
printf %s
On Wed, Sep 4, 2013 at 10:44 PM, Junio C Hamano gits...@pobox.com wrote:
Christian Couder chrisc...@tuxfamily.org writes:
If -f option, which means '--force', is used, we can allow an object
to be replaced with one of a different type, as the user should know
what (s)he is doing.
Signed-off
On Wed, Sep 4, 2013 at 10:45 PM, Junio C Hamano gits...@pobox.com wrote:
Christian Couder chrisc...@tuxfamily.org writes:
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/git
From: Junio C Hamano gits...@pobox.com
Christian Couder chrisc...@tuxfamily.org writes:
+test_expect_success 'replaced and replacement objects must be of the same
type' '
+test_must_fail git replace mytag $HASH1 2err
+grep mytag. points to a replaced object of type .tag err
Many patchs have been squashed together as Junio suggested.
And in patch 3/7 now no grep is done on the error message.
Christian Couder (7):
replace: forbid replacing an object with one of a different type
Documentation/replace: state that objects must be of the same type
t6050-replace
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 09bad98..09a2b49 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -276,4 +276,10 @@ test_expect_success
It is now standard practice in Git to have both short and long option
names. So let's give a long option name to the git replace options too.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 3 +++
builtin/replace.c | 6 +++---
2 files
There were no hints in the documentation about how to create
replacement objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Documentation/git-replace.txt | 16
1 file changed, 16 insertions(+)
diff --git a/Documentation/git-replace.txt b/Documentation/git
So that they are tested a little bit too.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 09a2b49..7d47984 100755
--- a/t/t6050-replace.sh
A previous patch ensures that both the replaced and the replacement
objects passed to git replace must be of the same type, except if
-f option is used.
While at it state that there is no other restriction on both objects.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
(these are the only valid modes)
* Blobs don't point at anything.
The doc will be updated in a later patch.
Acked-by: Philip Oakley philipoak...@iee.org
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
builtin/replace.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/builtin
and that the -f option bypasses the type check
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
t/t6050-replace.sh | 13 +
1 file changed, 13 insertions(+)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index decdc33..09bad98 100755
--- a/t/t6050-replace.sh
+++ b/t
Hi,
On Sat, Sep 15, 2012 at 11:49 PM, David Chanters
david.chant...@googlemail.com wrote:
Hi,
On 15 September 2012 18:21, Junio C Hamano gits...@pobox.com wrote:
Assuming that they do, pushing the replacement ref makes the
replacing object available in the pushed-into repository, so
they
Hi,
On Thu, Sep 20, 2012 at 8:53 PM, Sebastian Schuberth
sschube...@gmail.com wrote:
On 19.09.2012 15:43, Michael Haggerty wrote:
Is there any news about the proposed gatherings? I would be quite
interested in attending the developer meeting. October is just around
the corner...what's up?
On Fri, Sep 21, 2012 at 4:05 PM, Shawn Pearce spea...@spearce.org wrote:
On Fri, Sep 21, 2012 at 2:20 AM, Christian Couder
It is sad that people who know what is or what is not happening are
not taking care of letting people on this list know about it...
I did not post to this mailing list
Hi,
On Thu, Sep 27, 2012 at 6:55 PM, Laszlo Papp lp...@kde.org wrote:
Hi everybody,
I have just run into a problem when I had to issue an explicit cleanup for
tracked files after a configure run in the Qt5 project. I have tried to
suggest to the people to bring up this idea on the mailing
Hi,
On Mon, Oct 8, 2012 at 3:19 PM, Elia Pinto gitter.spi...@gmail.com wrote:
Ok. I have found. For me this is not a problem any more these days.
Was fixed in glibc 2.8.90-9 2008
* Wed Jul 16 2008 Jakub Jelinek ja...@redhat.com 2.8.90-9
- update from trunk
- fix unbuffered vfprintf if
Hi,
On Thu, Oct 25, 2012 at 4:41 AM, Matt Arsenault arse...@gmail.com wrote:
On Oct 21, 2012, at 12:06 , Junio C Hamano gits...@pobox.com wrote:
- Why is it a bug not to pass -s? How does the bug happen?
I encountered this one time after using it for months. One day I couldn't git
p4
Hi,
On Thu, Jun 13, 2013 at 12:19 PM, Thomas Adam tho...@xteddy.org wrote:
So these guidelines gain the community nothing, and only serve to punish
those who are already following them, without them being written down,
because the root-cause of the problem is still here, and isn't going to go
On Thu, Nov 22, 2012 at 11:11 PM, Eric S. Raymond e...@thyrsus.com wrote:
Shawn Pearce spea...@spearce.org:
[Lots of helpful stuff ended by]
4. How does git help work? That is, how is a subcommand expected
to know when it is being called to export its help text?
IIRC git help foo runs man
All the python scripts except contrib/svn-fe/svnrdump_sim.py
start with #!/usr/bin/env python.
This patch fix contrib/svn-fe/svnrdump_sim.py to do the same.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
contrib/svn-fe/svnrdump_sim.py | 2 +-
1 file changed, 1 insertion(+), 1
On Wed, Nov 28, 2012 at 9:03 AM, Felipe Contreras
felipe.contre...@gmail.com wrote:
On Wed, Nov 28, 2012 at 8:36 AM, Junio C Hamano gits...@pobox.com wrote:
Christian Couder chrisc...@tuxfamily.org writes:
All the python scripts except contrib/svn-fe/svnrdump_sim.py
start with #!/usr/bin/env
with the PYTHON_PATH and check
if it changed.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
Makefile | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 4ad6fbd..bd86063 100644
--- a/Makefile
+++ b/Makefile
@@ -2245,7 +2245,7
From: Junio C Hamano gits...@pobox.com
Subject: Re: [PATCH] Makefile: detect when PYTHON_PATH changes
Date: Sat, 15 Dec 2012 09:29:48 -0800
Christian Couder chrisc...@tuxfamily.org writes:
@@ -2636,6 +2636,18 @@ GIT-GUI-VARS: FORCE
fi
endif
+### Detect Python interpreter
It looks like we are tracking the value of TCLTK_PATH in the main
Makefile for no good reason, as this is done in git-gui too and the
GIT-GUI-VARS is not used in the Makefile.
This patch removes the useless code used to do this tracking.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
. We update a GIT-PYTHON-VARS file
with the PYTHON_PATH and check if it changed.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
.gitignore | 1 +
Makefile | 16 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6d69ae1
. We update a GIT-PYTHON-VARS file
with the PYTHON_PATH and check if it changed.
Signed-off-by: Christian Couder chrisc...@tuxfamily.org
---
.gitignore | 1 +
Makefile | 16 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6d69ae1
301 - 400 of 2901 matches
Mail list logo
