Hi,
The development of packv4 is fun. Like git, patches are exchanged over
email. But the series is long and sometimes I want to modify or even
drop an old patch without sending 90 mails to the list. I wonder if we
should teach git-am more about patch manipulation so that git am could
be told to:
Felipe Contreras felipe.contre...@gmail.com wrote:
I know 'git ci' is perfectly fine shortcut to 'git commit'.
Either way, it doesn't matter. Even if we agree that /etc/gitconfig.d
is what we want, or we add an /usr/share/git/config, Junio is not
going to apply any patch, even if it's what most
On 09/21/2013 12:51 AM, Junio C Hamano wrote:
Junio C Hamano gitster-v...@pobox.com writes:
I also agree that the documentation is misstated; remote-tracking branch
may have been a convenient and well understood phrase for whoever wrote
that part, but the --prune is designed to cull extra
On Sat, Sep 21, 2013 at 1:33 AM, David Aguilar dav...@gmail.com wrote:
Felipe Contreras felipe.contre...@gmail.com wrote:
I know 'git ci' is perfectly fine shortcut to 'git commit'.
Either way, it doesn't matter. Even if we agree that /etc/gitconfig.d
is what we want, or we add an
So replace 'git-foo' with 'git foo'.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-checkout.txt | 4 ++--
Documentation/git-commit.txt | 4 ++--
Documentation/git-rebase.txt | 4 ++--
Documentation/git-status.txt | 4 ++--
4 files changed, 8
For now simply add a few common aliases.
co = checkout
ci = commit
rb = rebase
st = status
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-checkout.txt | 5 +
Documentation/git-commit.txt | 5 +
Documentation/git-rebase.txt | 5 +
On Sat, Sep 21, 2013 at 2:42 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 09/21/2013 12:51 AM, Junio C Hamano wrote:
Junio C Hamano gitster-v...@pobox.com writes:
I also agree that the documentation is misstated; remote-tracking branch
may have been a convenient and well understood
From: Junio C Hamano gits...@pobox.com
To: git@vger.kernel.org
Sent: Friday, September 20, 2013 11:03 PM
* po/dot-url (2013-09-13) 2 commits
(merged to 'next' on 2013-09-20 at 6a12786)
+ config doc: update dot-repository notes
+ doc: command line interface (cli) dot-repository dwimmery
So that we can specify general modes of operation, specifically, add the
'next' mode, which makes Git pre v2.0 behave as Git v2.0.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/add.c | 13 +
cache.h | 6 ++
config.c | 13 +
This contains many bug fixes or cleanups. Also you can now run the
test suite with v4 by setting GIT_TEST_OPTS=--packv4. The test suite
passes now. pack size limit is not officially not supported with v4.
index-pack also learns to convert appended trees to v4 for completing
thin packs (still need
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/index-pack.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index f071ed9..fbf97f0 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -775,8 +775,8
In pack v4, commits should be forced to be loaded in canonical format
too (iow. deltified commits are flattened by read_sha1_file, we don't
care about object_entry-delta).
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/pack-objects.c | 7 ---
1 file changed, 4
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/pack-objects.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 30559e8..8e2e5e9 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@
we need to pass an offset pointing to the header because
unpack_entry() needs that..
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
packv4-parse.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/packv4-parse.c b/packv4-parse.c
index 6abd62e..e833cd2 100644
---
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/index-pack.c | 43 ---
packv4-create.c | 20
packv4-create.h | 2 ++
3 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/builtin/index-pack.c
This is a longer explation of what is noted in the patch. When object
names are received from stdin, we lazily put OBJ_NONE as type to
objects[]. check_object() is called for each entry in objects[] later,
when it checks for ref-delta and ofs-delta for straight copy to the
pack later.
In pack v4,
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Documentation/git-pack-objects.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/git-pack-objects.txt
b/Documentation/git-pack-objects.txt
index d94edcd..bb27fac 100644
--- a/Documentation/git-pack-objects.txt
+++
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
packv4-parse.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/packv4-parse.c b/packv4-parse.c
index 88b7aa1..31c89c7 100644
--- a/packv4-parse.c
+++ b/packv4-parse.c
@@ -473,16 +473,19 @@ static int
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 6b1fd1b..2e2ae2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,6 +190,7 @@
/test-match-trees
/test-mergesort
/test-mktemp
+/test-packv4
Don't die or it'll upset t5303's recovery action by repacking from
loose objects
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
packv4-parse.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/packv4-parse.c b/packv4-parse.c
index e833cd2..88b7aa1 100644
---
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
sha1_file.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sha1_file.c b/sha1_file.c
index e98eb8b..ef6ecc8 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -605,7 +605,9 @@ static int check_packed_git_idx(const char
!is_delta_tree() is not correct because the tree may have been
resolved in by find_unresolved_deltas() in the previous iteration of
this loop. Check for entry-idx.sha1 instead, that must be non-null
when we resolve the object.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
--packv4 also sets prerequisite PACKV4, which can be used to disable
v2-specific tests. You can run the test suite with
make test GIT_TEST_OPTS=--packv4
or just a specific test
./t5300-*.sh --packv4 -v -i
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
builtin/pack-objects.c | 4
These tests assume .pack v2 format and won't work with v4. New tests
may be needed to do the same thing with v4 format.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
t/t5302-pack-index.sh | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
t/t5300-pack-object.sh | 39 ++-
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index a07c871..62fc997 100755
---
pack v4 format does not go along well with pack size limit feature. v4
requires to know the number of objects in the pack in advance in order
to contruct various tables after pack header. When pack size is
limited, we don't know this number until we write objects out and hit
it. By then the only
git show-index does not work with .idx v3 which is the default for
.pack v4. Force .idx back to v2. Disable tests about OBJ_OFS_DELTA on
v4 because that is not supported.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
t/t5303-pack-corruption-resilience.sh | 16
1 file
There's no mention of the 'origin' default, or the fact that the
upstream tracking branch remote is used.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-fetch.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/git-fetch.txt
There's no need to set the default remote name beforehand, only to be
overridden later on, and causing a memory leak, we can do it after the
configuration has been handled.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
remote.c | 3 ++-
1 file changed, 2 insertions(+), 1
Felipe Contreras (2):
fetch: add missing documentation
remote: fix trivial memory leak
Documentation/git-fetch.txt | 3 +++
remote.c| 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
--
1.8.4.2.gac946cf.dirty
--
To unsubscribe from this list: send the line
The Git cli will accept dot '.' (period) as the relative path,
and thus the current repository. Explain this action.
Signed-off-by: Philip Oakley philipoak...@iee.org
---
This updates 431260cc8dd
Documentation/gitcli.txt | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
This completes the patch series on adding short notes about
the dot repository capability in git, which is a consequence of
the relative path '.' being used as a repository URL.
The previous 2/3 was accepted and is not repeated here.
Patch 3/3 is now an ammendment 1/2
Patch 1/3 is corrected and
Signed-off-by: Philip Oakley philipoak...@iee.org
---
Documentation/urls.txt | 8
1 file changed, 8 insertions(+)
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index 9ccb246..3469e8b 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -55,6 +55,14 @@ These
In Junio's recent patch series ([PATCH v3 0/7] Removing the guesswork
of HEAD in clone $gmane/234950), his first patch updated t5505: 'fix
set-head --auto with ambiguous HEAD test'.
A quick look at the git remote man page showed that --auto was not
documented, nor listed in usage stings.
This
Signed-off-by: Philip Oakley philipoak...@iee.org
---
Documentation/git-remote.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 9c3e3bf..2507c8b 100644
--- a/Documentation/git-remote.txt
+++
Signed-off-by: Philip Oakley philipoak...@iee.org
---
builtin/remote.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index eaac3e2..4e14891 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -12,7 +12,7 @@ static const char *
On Sat, 21 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
This contains many bug fixes or cleanups. Also you can now run the
test suite with v4 by setting GIT_TEST_OPTS=--packv4. The test suite
passes now. pack size limit is not officially not supported with v4.
index-pack also learns to convert
On Sat, 21 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
t/t5300-pack-object.sh | 39 ++-
1 file changed, 22 insertions(+), 17 deletions(-)
[...]
This, in combination with patch 10/17, is making the test
Hi all,
Back in April, I announced a couple of scripts I'd written to wrap
around git-cherry and git-notes, which help when you have more than a
trivial number of commits to upstream / backport from one branch to
another. Since then I've improved these scripts, and also written a
higher-level
Good Morning,
I am financial broker and intermediary. The investor l have on my list are
interested on a JV equity investment or a direct private bridge financing on
form of a long term loan provided the interest rate can meet up to 1.5% ROI
annually.
The investors I have can fund to the tune
Felipe Contreras felipe.contre...@gmail.com wrote:
For now simply add a few common aliases.
co = checkout
ci = commit
rb = rebase
st = status
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-checkout.txt | 5 +
Documentation/git-commit.txt | 5 +
Hi,
It was discussed before that there was a need to replace Git scripts from perl
and sh that utilize the 'git' binary to do everything they need, which requires
many forks, and that creates problems on platforms like Windows.
This is a first step meant to show how a solution using Ruby would
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Makefile | 4
cache.h | 2 ++
git.c| 3 +++
ruby.c | 48
4 files changed, 57 insertions(+)
create mode 100644 ruby.c
diff --git a/Makefile b/Makefile
index
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Makefile| 8 +++-
git-rb-setup.rb | 11 +++
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 git-rb-setup.rb
diff --git a/Makefile b/Makefile
index 7cbcbcb..138f9bf 100644
--- a/Makefile
+++
Purely for demonstration purposes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Makefile| 1 +
git-rb-setup.rb | 89
git-reset.rb| 223 ++
git.c | 1 -
ruby.c | 414
This is an example of how to start moving out of Git commands, towards
using Git's internal library.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-request-pull.rb | 8 +++-
ruby.c | 21 +
2 files changed, 28 insertions(+), 1 deletion(-)
So that we can use for_each_ref() inside Ruby, and provide an example
script.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Makefile| 1 +
git-refs.rb | 7 +++
ruby.c | 27 +++
3 files changed, 35 insertions(+)
create mode 100644
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Makefile| 2 +-
git-rb-setup.rb | 25
git-request-pull.rb | 153 +
git-request-pull.sh | 162
ruby.c
Ruby can do it just fine, no need for perl.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-request-pull.rb | 66 ++---
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/git-request-pull.rb b/git-request-pull.rb
Am 21.09.2013 13:47, schrieb Felipe Contreras:
diff --git a/Makefile b/Makefile
index 3588ca1..18081bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1010,7 +1010,7 @@ ifndef sysconfdir
ifeq ($(prefix),/usr)
sysconfdir = /etc
else
-sysconfdir = etc
+sysconfdir = $(prefix)/etc
Not good:
On Sat, Sep 21, 2013 at 1:58 PM, Johannes Sixt j...@kdbg.org wrote:
Am 21.09.2013 13:47, schrieb Felipe Contreras:
diff --git a/Makefile b/Makefile
index 3588ca1..18081bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1010,7 +1010,7 @@ ifndef sysconfdir
ifeq ($(prefix),/usr)
sysconfdir = /etc
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
alias.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/alias.c b/alias.c
index eb9f08b..9938f03 100644
--- a/alias.c
+++ b/alias.c
@@ -5,7 +5,7 @@ static char *alias_val;
static int
For now simply add a few common aliases.
co = checkout
ci = commit
rb = rebase
st = status
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
I still think we should ship a default /etc/gitconfig, but the project needs to
agree it's a good change, and nobody every agrees
Hi everybody!
I need some help with Git.
I'm making a script `gm` which lets me merge one branch into another
without having either checked out. It works for some cases but not all.
I'm trying to make it work for more cases.
I concluded that the best way to do it would be by using an
On Tue, Sep 17, 2013 at 10:24:19AM -0700, Junio C Hamano wrote:
Michael S. Tsirkin m...@redhat.com writes:
So might it not be useful to tweak patch id to
sort the diff, making it a bit more stable?
That is one thing that needs to be done, I think. But it would be
unfortunate if we have
On Sat, Sep 21, 2013 at 01:48:08PM -0500, Felipe Contreras wrote:
Hi,
It was discussed before that there was a need to replace Git scripts
from perl and sh that utilize the 'git' binary to do everything they
need, which requires many forks, and that creates problems on
platforms like
Hello,
When trying out Roberto Tyley's BFG Repo-Cleaner program [1], I managed
to put a git repository in the following state:
[2] fs@erdos /tmp/bfg-test-repo $ cat .git/logs/HEAD
00afb9f9a0c87dba4a203413358984e9f4fa5ffb Keshav Kini
On Sat, Sep 21, 2013 at 4:29 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
On Sat, Sep 21, 2013 at 01:48:08PM -0500, Felipe Contreras wrote:
Hi,
It was discussed before that there was a need to replace Git scripts
from perl and sh that utilize the 'git' binary to do everything they
On Sat, Sep 21, 2013 at 05:52:05PM -0500, Felipe Contreras wrote:
On Sat, Sep 21, 2013 at 4:29 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
As Junio has also pointed out in the past, there are people who aren't
able to use Ruby in the same way that they are Perl and Python. If
On Sat, 21 Sep 2013, Nguyễn Thái Ngọc Duy wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
sha1_file.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sha1_file.c b/sha1_file.c
index e98eb8b..ef6ecc8 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@
On Sat, Sep 21, 2013 at 11:46 PM, Nicolas Pitre n...@fluxnic.net wrote:
On Sat, 21 Sep 2013, Nguyn Thái Ng÷c Duy wrote:
Signed-off-by: Nguyn Thái Ng÷c Duy pclo...@gmail.com
---
t/t5300-pack-object.sh | 39 ++-
1 file changed, 22 insertions(+), 17
On Sun, 22 Sep 2013, Duy Nguyen wrote:
On Sat, Sep 21, 2013 at 11:46 PM, Nicolas Pitre n...@fluxnic.net wrote:
On Sat, 21 Sep 2013, Nguyn Thái Ng÷c Duy wrote:
Signed-off-by: Nguyn Thái Ng÷c Duy pclo...@gmail.com
---
t/t5300-pack-object.sh | 39
On Sat, Sep 21, 2013 at 9:58 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
[PATCH 14/17] t5302: disable sealth corruption tests when run with --packv4
s/sealth/stealth/
These tests assume .pack v2 format and won't work with v4. New tests
may be needed to do the same thing with v4 format.
Keshav Kini keshav.k...@gmail.com writes:
For example, if `git
reflog show HEAD` displayed this:
0123456 [stuff] foo
789abcd [stuff] bar
ef01234 [stuff] baz
Then I would expect the reflog data file for HEAD to look something like
this, where '.' represents an unknown hex
Felipe Contreras felipe.contre...@gmail.com wrote:
On Sat, Sep 21, 2013 at 1:58 PM, Johannes Sixt j...@kdbg.org wrote:
Am 21.09.2013 13:47, schrieb Felipe Contreras:
diff --git a/Makefile b/Makefile
index 3588ca1..18081bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1010,7 +1010,7 @@ ifndef
David Aguilar wrote:
Felipe Contreras felipe.contre...@gmail.com wrote:
On Sat, Sep 21, 2013 at 1:58 PM, Johannes Sixt j...@kdbg.org wrote:
Am 21.09.2013 13:47, schrieb Felipe Contreras:
diff --git a/Makefile b/Makefile
index 3588ca1..18081bf 100644
--- a/Makefile
+++ b/Makefile
@@
brian m. carlson wrote:
On Sat, Sep 21, 2013 at 05:52:05PM -0500, Felipe Contreras wrote:
On Sat, Sep 21, 2013 at 4:29 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
As Junio has also pointed out in the past, there are people who aren't
able to use Ruby in the same way that
67 matches
Mail list logo
