Commit 908a3203632a02568df230c0fccf9a2cd8da24e6 introduced indentation
to here documents in t3301.sh. However in one place -EOF was missing
-, which broke this test when run with mksh-50d. This commit fixes it.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
t/t3301-notes.sh | 2 +-
1
On Mon, Jan 27, 2014 at 10:58:29AM -0800, Jonathan Nieder wrote:
Hi,
Kacper Kornet wrote:
The change in release numbering also breaks down gitolite v2 setups. One
of the gitolite commands, gl-compile-conf, expects the output of git
--version
to match /git version (\d+)\.(\d+)\.(\d
On Tue, Jan 21, 2014 at 02:14:22PM -0800, Junio C Hamano wrote:
It has been reported that turning git.rc into git.res does not like
the new 2-dewey-decimal release numbering scheme; packagers of
various distro might find similar issues in their build procedures,
in which case they have about 3
the test ends with success as
the printf is a builtin utility.
Fix it by using '\\%o' which is interpreted consistently in all versions
of printf.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
I've found it while testing v1.8.5-rc0 with mksh which does not
provide a builtin printf.
Kacper
t
On Tue, Aug 27, 2013 at 12:22:30PM -0700, Junio C Hamano wrote:
* kk/tests-with-no-perl (2013-08-24) 4 commits
- reset test: modernize style
- t/t7106-reset-unborn-branch.sh: Add PERL prerequisite
- add -i test: use skip_all instead of repeated PERL prerequisite
- Make test using invalid
Starting from 6035d6a fetch-pack: prepare updated shallow file before
fetching the pack the shallow fetches of commits with tags can result
in broken git repo. The following script illustrates the problem:
#!/bin/sh
mkdir repo1 repo2
cd repo1
git init
for i in `seq 1 3`; do
echo $i foo
-by: Kacper Kornet drae...@pld-linux.org
---
t/t7501-commit.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 99ce36f..699a603 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -53,7 +53,10 @@ test_expect_success PERL 'can
This is a set of fixes for problems found while running
test suite without perl installed.
Kacper
--
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
The test 'patch mode ignores unmerged entries' uses git-add -p, so it
depends on the perl code.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
t/t3701-add-interactive.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add
-by: Kacper Kornet drae...@pld-linux.org
---
t/t7501-commit.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 99ce36f..699a603 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -53,7 +53,10 @@ test_expect_success PERL 'can
two different machines with
different Linux distributions and perl versions.
--
Kacper Kornet
--
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
is
younger then the youngest commit on the list to processed.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
I don't know whether the first version was overlooked or deemed as not
worthy. So just in case I resend it. Changes since the first version:
1. The test has been added
2. The commit log
On Fri, Mar 22, 2013 at 01:45:47PM -0700, Junio C Hamano wrote:
Kacper Kornet drae...@pld-linux.org writes:
Logic in still_interesting function allows to stop the commits
traversing if the oldest processed commit is not older then the
youngest commit on the list to process and the list
Syntax branchname@{upstream} should interpret its argument as a name of
a branch. Add the test to check that it doesn't try to interpret it as a
refname if the branch in question does not exist.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
Maybe I'm too cautious adding this test
to believe that the string is
interpreted as ref.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
Documentation/revisions.txt | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 678d175..314e25d 100644
git rev-list A^! --not B provides wrong answer if all commits in the
range A..B had the same commit times and there are more then 8 of them.
This commits fixes the logic in still_interesting function to prevent
this error.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
revision.c | 2
and theirs upstream.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
Documentation/merge-options.txt | 7 +++
builtin/commit.c| 8 +++-
builtin/merge.c | 16
commit.c| 11 +++
commit.h
It is in preparation to introduce --transpose-parents option to
git-merge, when the content of MERGE_MODE will dictate how the
MERGE_HEAD is interpreted.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
builtin/commit.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions
Presently only one merge mode exists: non-fast-forward. But in future
the second one (transpose-parents) will be added, so the need to read
all lines of MERGE_MODE.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
builtin/commit.c | 12 ++--
1 file changed, 6 insertions(+), 6
introduces the new option
- The documentation for the new options has been added
This is not yet a final version, as the tests are missing. But maybe while I'm
working
on them there will be some comments.
Kacper Kornet (3):
Process MERGE_MODE before MERGE_HEAD
Allow for MERGE_MODE to specify more
On Tue, Nov 27, 2012 at 06:17:28PM -0800, Junio C Hamano wrote:
Kacper Kornet drae...@pld-linux.org writes:
Presently only one merge mode exists: non-fast-forward. But in future
the second one (transpose-parents) will be added, so the need to read
all lines of MERGE_MODE.
Signed-off
On Tue, Nov 27, 2012 at 06:18:00PM -0800, Junio C Hamano wrote:
Kacper Kornet drae...@pld-linux.org writes:
+--transpose-parents::
+ Transpose the parents in the final commit. The change is made
+ just before the commit so the meaning of 'our' and 'their'
+ concepts remains
On Fri, Nov 23, 2012 at 06:58:49PM -0800, Junio C Hamano wrote:
Kacper Kornet drae...@pld-linux.org writes:
The following patch is an attempt to implement this idea.
I think revert is a wrong word (implying you have already done
something and you are trying to defeat the effect of that old
is an attempt to implement this idea.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
---
I'm not 100% percent sure that it is a good idea. But it would make life
of our developers easier and produced nicer history then using git pull.
Git pull seems to written for a case of single maintainer who
On Wed, Nov 14, 2012 at 12:29:14AM -0600, Chris Rorvick wrote:
2. Require force when updating tag references, even on a fast-forward.
push: flag updates
push: flag updates that require force
push: update remote tags only with force
An email thread initiated by
On Mon, Oct 29, 2012 at 09:12:52AM +0100, Angelo Borsotti wrote:
Hi,
to let the owner of a remote repository (one on which git-push
deposits objects) disallow
others to change tags, a key on its config file could be used.
An option on git-push, or environment variable, or key in config file
On Mon, Oct 29, 2012 at 07:35:00AM -0400, Jeff King wrote:
On Mon, Oct 29, 2012 at 07:21:52AM -0400, Drew Northup wrote:
I would have expected git to at least complain about updating an
annotated tag with another annotated tag. But it actually uses the same
fast-forward rule, just on
)
- || !ref_newer(ref-new_sha1, ref-old_sha1));
+ || !prefixcmp(ref-name, refs/tags) ||
!ref_newer(ref-new_sha1, ref-old_sha1));
if (ref-nonfastforward !ref-force !force_update) {
ref-status = REF_STATUS_REJECT_NONFASTFORWARD;
--
Kacper
On Fri, Oct 26, 2012 at 02:07:09PM -0400, Drew Northup wrote:
On Fri, Oct 26, 2012 at 1:42 PM, Kacper Kornet drae...@pld-linux.org wrote:
On Thu, Oct 25, 2012 at 05:16:00PM -0400, Drew Northup wrote:
On Thu, Oct 25, 2012 at 3:05 PM, Angelo Borsotti
angelo.borso...@gmail.com wrote
a crude patch to show that the behaviour asked by you
is possible to obtain.
I will try to prepare a formal submission patch, but I can't say how
long it will take me. So if you want to do it by yourself feel free.
--
Kacper Kornet
--
To unsubscribe from this list: send the line unsubscribe git
Documentation to git-rev-parse claims that
-q, --quiet
Only meaningful in --verify mode. Do not output an error
message if the first argument is not a valid object name; instead exit
with non-zero status silently.
However when I try to check if the current branch has a configured
-by: Kacper Kornet drae...@pld-linux.org
---
t/t6300-for-each-ref.sh | 10 ++
1 file changed, 10 insertions(+)
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 1721784..a0d82d4 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -456,4 +456,14
The linked list describing sort options was not correctly set up in
opt_parse_sort. In the result, contrary to the documentation, only the
last of multiple --sort options to git-for-each-ref was taken into
account. This commit fixes it.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
-by: Kacper Kornet drae...@pld-linux.org
---
t/t6300-for-each-ref.sh | 33 -
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 1721784..3d59bfc 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300
The linked list describing sort options was not correctly set up in
opt_parse_sort. In the result, contrary to the documentation. only the
last of multiple --sort options to git-for-each-ref was taken into
account. This commit fixes it.
Signed-off-by: Kacper Kornet drae...@pld-linux.org
On Sun, Aug 19, 2012 at 05:38:29PM -0700, Junio C Hamano wrote:
Kacper Kornet drae...@pld-linux.org writes:
Documentation of git-for-each-ref says that --sort=key option can be
used multiple times, in which case the last key becomes the primary key.
However this functionality was never
36 matches
Mail list logo
