Hello everyone,
I'm Mathieu LIENARD--MAYOR, a french student at Ensimag - Grenoble INP,
and together with my fellow student Jorge GARCIA we will try to
contribute to git as our school project.
As of now, we are considering the implementation of the following two
features:
-Cleaner error mess
The other configurations were added in the wrong place.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 88db7c4..1
Follow the style of the previous configurations.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index beb864b..88db7c4 100755
Hi,
For 'master'.
Felipe Contreras (2):
remote-hg: trivial configuration note cleanup
remote-hg: fix order of configuration comments
contrib/remote-helpers/git-remote-hg | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
1.8.3.rc3.1.gf11a2b7.dirty
--
To unsubscribe from thi
จับได้ว่า Ambranews ใช้ศาสนาเป็นอาวุธ
เมื่อต้นเดือนพฤษภาคมที่ผ่านมานี้ เวปไซต์ ambranews จัดตั้งและดำเนินงานอยู่
ในประเทศมาเลเซีย ได้นำเสนอข่าวเป็นภาษามาเลเซียโจมตีการทำงานของเจ้าหน้าที่ไทย
โดยใช้คำว่า คนมาลายู แทนคนไทยมุสลิมในจังหวัดชายแดนภาคใต้ต่อกรณียิงกราด 6
ศพว่าเป็นการกระทำของเจ้าหน
Certain remote-helpers (the ones with 'export') would try to push
regardless.
Obviously this is not what the user wants.
Also, add a check for the 'dry-run' option, so remote-helpers can
implement it.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 5 +
1 file changed, 5 insertion
On Mon, May 20, 2013 at 8:09 PM, Felipe Contreras
wrote:
> Certain remote-helpers (the ones with 'export') would try to push
> regardless.
>
> Obviously this is not what the user wants.
>
> Signed-off-by: Felipe Contreras
> ---
> transport-helper.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>
On Tue, May 21, 2013 at 2:15 AM, Junio C Hamano wrote:
> * jh/shorten-refname (2013-05-07) 4 commits
> - t1514: refname shortening is done after dereferencing symbolic refs
> - shorten_unambiguous_ref(): Fix shortening refs/remotes/origin/HEAD to
> origin
> - t1514: Demonstrate failure to corr
Certain remote-helpers (the ones with 'export') would try to push
regardless.
Obviously this is not what the user wants.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c
index 522d791..daebdd9 1
Otherwise with certain remote helpers (the ones that support 'export'),
the users will be pushing to the wrong branch:
git push topic:master
Will push the topic branch, as if the user typed:
git push topic
Signed-off-by: Felipe Contreras
---
I did fix this properly, but was beaten by shoo
Hi,
I am looking at formulating and then documenting our vcs workflow
using Git at work. I have an idea of how I want things to work, but am
a little hazy on some of the details.
Our basic workflow will be based around:
http://nvie.com/posts/a-successful-git-branching-model, with a few
exceptions
On Mon, May 20, 2013 at 7:33 PM, Felipe Contreras
wrote:
> zsh completion wrapper doesn't reimplement __gitcompadd(). Although it
> should be trivial to do that, let's use __gitcomp_nl() which achieves
> exactly the same thing, specially since the suffix ($4) has to be empty.
>
> Signed-off-by: Fe
zsh completion wrapper doesn't reimplement __gitcompadd(). Although it
should be trivial to do that, let's use __gitcomp_nl() which achieves
exactly the same thing, specially since the suffix ($4) has to be empty.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.bash | 2 +-
On Mon, May 20, 2013 at 7:15 PM, Junio C Hamano wrote:
> * fc/at-head (2013-05-08) 13 commits
> - sha1_name: compare variable with constant, not constant with variable
> - Add new @ shortcut for HEAD
> - sha1_name: refactor reinterpret()
> - sha1_name: check @{-N} errors sooner
> - sha1_name
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The final version of 1.8.3 is expected to be tagged late this week.
While applying a few regression hot-fix patches, a couple of benign
doc upda
On Mon, May 20, 2013 at 6:13 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> On Mon, May 20, 2013 at 5:47 PM, Junio C Hamano wrote:
>>> Felipe Contreras writes:
>>>
Hi,
I've setup a project in Travis CI for continuous integration with very good
results, however, I
Felipe Contreras writes:
> On Mon, May 20, 2013 at 5:47 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> Hi,
>>>
>>> I've setup a project in Travis CI for continuous integration with very good
>>> results, however, I had to apply a couple of fixes.
>>>
>>> I'm not sure if this is v1
Eric Wong writes:
> Junio C Hamano wrote:
>> Thanks; is it a good time for me to pull?
>
> Yes, I think so. Thanks!
>
> The following changes since commit de3a5c6da194928868b5eee4a9c4d538b4194727:
>
> Git 1.8.3-rc3 (2013-05-17 12:19:20 -0700)
>
> are available in the git repository at:
>
>
On Wed, May 15, 2013 at 6:42 PM, Junio C Hamano wrote:
> * fc/completion (2013-04-27) 9 commits
> - completion: remove __git_index_file_list_filter()
> - completion: add space after completed filename
> - completion: add hack to enable file mode in bash < 4
> - completion: refactor __git_comp
On Mon, May 20, 2013 at 5:47 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> Hi,
>>
>> I've setup a project in Travis CI for continuous integration with very good
>> results, however, I had to apply a couple of fixes.
>>
>> I'm not sure if this is v1.8.3 material, but here they are.
>
>
Thanks, will replace da/darwin with this round.
--
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
Will replace what has been queued on 'pu' with trivial style fixups
(haven't had a chance to make time to read it through). Thanks.
--
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
Thanks, will queue.
--
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
Jonathan Nieder writes:
> Thanks and hope that helps,
> Jonathan
Thanks, the result reads much better, I think.
Albert?
> diff --git i/Documentation/git-diff-index.txt
> w/Documentation/git-diff-index.txt
> index 58308e15..a86cf62e 100644
> --- i/Documentation/git-diff-index.txt
> +++ w/Docu
Thanks, will queue.
--
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
Felipe Contreras writes:
> Hi,
>
> I've setup a project in Travis CI for continuous integration with very good
> results, however, I had to apply a couple of fixes.
>
> I'm not sure if this is v1.8.3 material, but here they are.
Thanks; I'll queue them at the tip of fc/remote-hg to graduate soon
Junio C Hamano wrote:
> Thanks; is it a good time for me to pull?
Yes, I think so. Thanks!
The following changes since commit de3a5c6da194928868b5eee4a9c4d538b4194727:
Git 1.8.3-rc3 (2013-05-17 12:19:20 -0700)
are available in the git repository at:
git://git.bogomips.org/git-svn.git mas
Eric Wong writes:
> Tobias Schulte wrote:
>> This parameter is equivalent to the parameter --parents on svn cp commands
>> and is useful for non-standard repository layouts.
>>
>> Signed-off-by: Tobias Schulte
>
> Signed-off-by: Eric Wong
>
> Applied and pushed, thanks.
Thanks; is it a good
Dmitry Marakasov writes:
> Use /bin/sh interpreter instead of /bin/bash for contrib/git-subtree:
> it's required for systems which don't use bash by default (for example,
> FreeBSD), while there seem to be no bashisms in the script (confirmed
> by looking through the source and tesing subtree fun
"Philip Oakley" writes:
> From: "Junio C Hamano"
> Sent: Monday, May 20, 2013 5:43 AM
>> Jonathan Nieder writes:
>>
>>> Philip Oakley wrote:
>>>
Describe rebase in the description section.
>>>
>>> It already does that. :) I think you mean "start with a summary",
>>> which is a valuable im
"Philip Oakley" writes:
> So we can have a branch whose remote is '.'
> _and_ a remote whose URL is '.'
Yes, and they are two separate concepts.
"git fetch" while on "mywork" branch with this:
[branch "mywork"]
remote = git://git.k.org/pub/scm/git/git.git
merge = refs/heads
Tobias Schulte wrote:
> This parameter is equivalent to the parameter --parents on svn cp commands
> and is useful for non-standard repository layouts.
>
> Signed-off-by: Tobias Schulte
Signed-off-by: Eric Wong
Applied and pushed, thanks.
--
To unsubscribe from this list: send the line "unsub
From: "Junio C Hamano"
Sent: Monday, May 20, 2013 5:43 AM
Jonathan Nieder writes:
Philip Oakley wrote:
Describe rebase in the description section.
It already does that. :) I think you mean "start with a summary",
which is a valuable improvement.
It indeed is a good idea to give the "hi
On 05/20/2013 06:44 PM, Jeff King wrote:
> On Mon, May 20, 2013 at 04:42:38PM +0200, Michael Haggerty wrote:
>
* Many callers store the empty string ("") as the name; for example,
most of the entries created during a run of rev-list have "" as
their name. This means that lots o
From: "Junio C Hamano"
Sent: Monday, May 20, 2013 6:50 PM
Jonathan Nieder writes:
Philip Oakley wrote:
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -734,6 +734,8 @@ branch..remote::
overridden by `branch..pushremote`. If no remote is
configured, or if you are not on a
From: "Junio C Hamano"
Sent: Monday, May 20, 2013 6:55 PM
Jonathan Nieder writes:
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -59,6 +59,10 @@ working tree. After running `git add hello.c; rm
hello.c`, you will _not_
see `hello.c` in your working tree with the former, b
Use /bin/sh interpreter instead of /bin/bash for contrib/git-subtree:
it's required for systems which don't use bash by default (for example,
FreeBSD), while there seem to be no bashisms in the script (confirmed
by looking through the source and tesing subtree functionality with
FreeBSD's /bin/sh)
Am 20.05.2013 21:54, schrieb Eric Sunshine:
On Mon, May 20, 2013 at 5:58 AM, René Scharfe
wrote:
+check_tar() {
+ tarfile=$1.tar
+ listfile=$1.lst
+ dir=$1
+ dir_with_prefix=$dir/$2
+
+ test_expect_success ' extract tar archive' '
s/' extract/'extract/
It might
Am 20.05.2013 21:53, schrieb Eric Sunshine:
On Mon, May 20, 2013 at 5:58 AM, René Scharfe
wrote:
Instead of creating extra archives for testing substitutions, set the
attribute export-subst and overwrite the marked file with the expected
(expanded) content right between commiting and archiving.
unsubscribe 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
On Mon, May 20, 2013 at 5:58 AM, René Scharfe
wrote:
> diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
> index a1f35d2..c2023b1 100755
> --- a/t/t5000-tar-tree.sh
> +++ b/t/t5000-tar-tree.sh
> @@ -40,6 +66,24 @@ check_tar() {
> (mkdir $dir && cd $dir && "$TAR" xf -) <$tarfil
On Mon, May 20, 2013 at 5:58 AM, René Scharfe
wrote:
> Create a helper function that extracts a tar archive and checks its
> contents, modelled after check_zip in t5003.
>
> Signed-off-by: René Scharfe
> ---
> t/t5000-tar-tree.sh | 35 ++-
> 1 file changed, 22 ins
On Mon, May 20, 2013 at 5:58 AM, René Scharfe
wrote:
> Instead of creating extra archives for testing substitutions, set the
> attribute export-subst and overwrite the marked file with the expected
> (expanded) content right between commiting and archiving. Thus
> placeholder expansion based on t
Thanks for the update. I would like to add some comments on this G+E glossary
and I hope you are interested in reading those, even though it is known that I
prefer a "pure Ger" translation. However, as I wrote in my other message I
agree that for the command line tool the criteria for choosing t
On Mon, May 20, 2013 at 8:28 PM, Junio C Hamano wrote:
> Johan Herland writes:
>
>> I wasn't considering disallowing _anything_, rather open up to the
>> idea that a tree object might refer to tag objects as well as
>> commits/trees/blobs. E.g. in my suggested-but-pretty-much-retracted
>> scheme,
Johan Herland writes:
> I wasn't considering disallowing _anything_, rather open up to the
> idea that a tree object might refer to tag objects as well as
> commits/trees/blobs. E.g. in my suggested-but-pretty-much-retracted
> scheme, I was considering whether the tree entry at the "virtual" path
Felipe Contreras writes:
> On Sun, May 19, 2013 at 6:53 AM, Felipe Contreras
> wrote:
>> From: Amit Bakshi
>>
>> git clone hangs on windows, and file.write would return errno 22 inside
>> of mercurial's windows.winstdout wrapper class. This patch sets stdout's
>> mode to binary, fixing both iss
Jeff King writes:
> But more importantly, it introduces contention between two unrelated
> refs that are being updated. Even if we reconcile the differences
> automatically (e.g., with a "merge-and-retry" strategy), that is going
> to be a serious performance regression for a busy repository, as
Jonathan Nieder writes:
>> --- a/Documentation/gitcli.txt
>> +++ b/Documentation/gitcli.txt
>> @@ -59,6 +59,10 @@ working tree. After running `git add hello.c; rm
>> hello.c`, you will _not_
>> see `hello.c` in your working tree with the former, but with the latter
>> you will.
>>
>> +Just
Jonathan Nieder writes:
> Philip Oakley wrote:
>
>> --- a/Documentation/config.txt
>> +++ b/Documentation/config.txt
>> @@ -734,6 +734,8 @@ branch..remote::
>> overridden by `branch..pushremote`. If no remote is
>> configured, or if you are not on any branch, it defaults to
>> `or
On Mon, May 20, 2013 at 7:21 PM, Junio C Hamano wrote:
> Johan Herland writes:
>
>>> Of course in either case we couldn't use a tree object directly, because
>>> these new "reference tree" objects would refer not only to blobs and
>>> other trees but also to commits and tags.
>>
>> Indeed. I don'
Johan Herland writes:
>> Of course in either case we couldn't use a tree object directly, because
>> these new "reference tree" objects would refer not only to blobs and
>> other trees but also to commits and tags.
>
> Indeed. I don't know if the best solution would be to actually _allow_
> that
On Mon, May 20, 2013 at 6:59 PM, Jeff King wrote:
> On Mon, May 20, 2013 at 09:37:30AM -0700, Junio C Hamano wrote:
>> Johan Herland writes:
>>
>> > For server-class installations we need ref storage that can be read
>> > (and updated?) atomically, and the current system of loose + packed
>> > fi
On Mon, May 20, 2013 at 6:37 PM, Junio C Hamano wrote:
> Johan Herland writes:
>> For server-class installations we need ref storage that can be read
>> (and updated?) atomically, and the current system of loose + packed
>> files won't work since reading (and updating) more than a single file
>>
On Mon, May 20, 2013 at 09:37:30AM -0700, Junio C Hamano wrote:
> Johan Herland writes:
>
> > For server-class installations we need ref storage that can be read
> > (and updated?) atomically, and the current system of loose + packed
> > files won't work since reading (and updating) more than a
On Mon, May 20, 2013 at 04:42:38PM +0200, Michael Haggerty wrote:
> >> * Many callers store the empty string ("") as the name; for example,
> >> most of the entries created during a run of rev-list have "" as
> >> their name. This means that lots of needless copies of "" are being
> >> made
Johan Herland writes:
> For server-class installations we need ref storage that can be read
> (and updated?) atomically, and the current system of loose + packed
> files won't work since reading (and updating) more than a single file
> is not an atomic operation. Trivially, one could resolve this
Duy Nguyen writes:
> On Thu, May 16, 2013 at 6:42 AM, Junio C Hamano wrote:
>> * nd/warn-ambiguous-object-name (2013-05-07) 1 commit
>> - get_sha1: improve ambiguity warning regarding SHA-1 and ref names
>>
>> "git cmd ", when happens to be a 40-hex string,
>> directly uses the 40-hex string
--
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
On 05/20/2013 12:33 PM, Johan Herland wrote:
> On Sun, May 19, 2013 at 10:27 PM, Michael Haggerty
> wrote:
>> This is the culmination of the last few commits. Since some callers
>> want to store refnames in the name field of object_array elements, but
>> we don't want those callers to assume tha
On Mon, May 20, 2013 at 2:15 PM, Michael Haggerty wrote:
> This is a very interesting idea. "It's turtles all the way down."
:)
> On 05/20/2013 12:28 PM, Johan Herland wrote:
>> For server-class installations we need ref storage that can be read
>> (and updated?) atomically, and the current sys
This is a very interesting idea. "It's turtles all the way down."
On 05/20/2013 12:28 PM, Johan Herland wrote:
> (Sorry for going slightly off-topic and returning to the general
> discussion on how to resolve the race conditions...)
>
> For server-class installations we need ref storage that can
Am 20.05.2013 11:58, schrieb René Scharfe:
This series adds a test that exercises git archive's pax header code.
It checks for tar versions that don't support pax headers and works
around their deficiency.
The first five patches are cleanups and refactorings to centralize
tar calls into a helper
On Sun, May 19, 2013 at 10:27 PM, Michael Haggerty wrote:
> This is the culmination of the last few commits. Since some callers
> want to store refnames in the name field of object_array elements, but
> we don't want those callers to assume that the refnames that they got
> from for_each_ref() ha
On Mon, May 20, 2013 at 09:32:21AM +0400, Kirill Berezin wrote:
> When you trying to add submodule, that already has submodule, it craches.
> For example you could try: git clone --recursive
> http://github.com/Exsul/al_server
Which version of Git were you using? I was not able to reproduce this
On Sun, May 19, 2013 at 10:26 PM, Michael Haggerty wrote:
> Recently a number of race conditions related to references have been
> discovered. There is likely to be a two-pronged solution to the
> races:
>
> * For traditional, filesystem-based references, there will have to be
> more checks tha
On Thu, May 16, 2013 at 6:42 AM, Junio C Hamano wrote:
> * nd/warn-ambiguous-object-name (2013-05-07) 1 commit
> - get_sha1: improve ambiguity warning regarding SHA-1 and ref names
>
> "git cmd ", when happens to be a 40-hex string,
> directly uses the 40-hex string as an object name, even if
Instead of creating extra archives for testing substitutions, set the
attribute export-subst and overwrite the marked file with the expected
(expanded) content right between commiting and archiving. Thus
placeholder expansion based on the committed content is performed with
each archive creation a
Create the directories b and c just before they are needed instead of
up front. For t5003 it turns out we don't need them at all. For t5000
it makes the coming modifications easier.
Signed-off-by: René Scharfe
---
t/t5000-tar-tree.sh| 6 +++---
t/t5003-archive-zip.sh | 2 +-
2 files change
Add a file with a long name to the test archive in order to check
entries with pax extended headers. Also add a check for tar versions
that doen't understand this format. Those versions should extract the
headers as a regular files. Add code to check_tar() to interpret the
path header if present
Create a helper function that extracts a tar archive and checks its
contents, modelled after check_zip in t5003.
Signed-off-by: René Scharfe
---
t/t5000-tar-tree.sh | 35 ++-
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/t/t5000-tar-tree.sh b/t/t
Perform the full range of checks against all archived files instead of
looking only at the file type of a few of them. Also add a test of a
git archive with a prefix ending in with a slash, i.e. adding a full
directory level.
Signed-off-by: René Scharfe
---
t/t5000-tar-tree.sh | 24
Just compare the archives created by git tar-tree with the ones created
using git archive with the equivalent options, whose contents are
checked already, instead of extracting them again.
Signed-off-by: René Scharfe
---
t/t5000-tar-tree.sh | 31 ---
1 file changed, 8
This series adds a test that exercises git archive's pax header code.
It checks for tar versions that don't support pax headers and works
around their deficiency.
The first five patches are cleanups and refactorings to centralize
tar calls into a helper function. The last patch adds the workaroun
On Sun, May 19, 2013 at 11:36:23PM -0700, Jonathan Nieder wrote:
> I don't know what it should mean to try to use --cherry without
> --no-merges or --first-parent, so I guess this is harmless.
Currently --no-merges doesn't actually get passed down this far. We do
the patch ID calculations without
Philip Oakley wrote:
> From: "Thomas Ackermann"
>> (5) Large overlapping with the tutorials. IMHO all of the
>> tutorials should be blended into user-manual
[...]
> I would be a little cautious of your point 5 if it squoze everything into
> one overlong document at the expense of losing the short
76 matches
Mail list logo
