Ramsay Jones writes:
> Thomas Gummerer wrote:
>> Hi,
>>
>> previous rounds (without api) are at $gmane/202752, $gmane/202923,
>> $gmane/203088 and $gmane/203517, the previous round with api was at
>> $gmane/229732. Thanks to Junio, Duy and Eric for their comments on
>> the previous round.
>
> If
Duy Nguyen writes:
> On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer
> wrote:
>> + if (!with_tree) {
>> + memset(opts, 0, sizeof(*opts));
>> + opts->pathspec = &pathspec_struct;
>> + opts->read_staged = 1;
>> + if (show_resolve_und
Duy Nguyen writes:
> On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer
> wrote:
>> +== Directory offsets (diroffsets)
>> +
>> + diroffset (32-bits): offset to the directory relative to the beginning
>> +of the index file. There are ndir + 1 offsets in the diroffset table,
>> +the last
Duy Nguyen writes:
[..]
>> +static int read_entries(struct index_state *istate, struct directory_entry
>> **de,
>> + unsigned int *entry_offset, void **mmap,
>> + unsigned long mmap_size, unsigned int *nr,
>> + unsigned int *foff
Duy Nguyen writes:
> On Mon, Jul 15, 2013 at 4:30 PM, Thomas Gummerer wrote:
>> Duy Nguyen writes:
>>
>>> On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer
>>> wrote:
t/perf/p0003-index.sh| 59 +
t/t2104-update-index-skip-worktree.sh|1
Ralf Thielow writes:
> This switches the translation from pure German to German+English.
>
I tried to compare this to the old version, but your patch is damaged at
line 160 counting from this:
> ---
> po/de.po | 568
> +++
> 1 file c
On Mon, Jul 15, 2013 at 07:25:19PM +0700, Duy Nguyen wrote:
>
> I noticed that "quiet" and "agent" capabilities were missing in
> protocol-capabilitities.txt. I have a rough idea what they do, but I
> think it's best to be documented by the authors. Maybe you have some
> time to make a patch?
Hi D
This is probably the first attempt to treat shallow clones just like
ordinary ones. Which means you can push or fetch/clone between any two
repos, regardless of their shallow status. There are two purposes
behind this:
- to make local/shallow clone <-> (complete) upstream repo workflow
smoothe
Signed-off-by: Nguyễn Thái Ngọc Duy
---
transport.h | 6 --
1 file changed, 6 deletions(-)
diff --git a/transport.h b/transport.h
index ea70ea7..3178dc9 100644
--- a/transport.h
+++ b/transport.h
@@ -182,10 +182,4 @@ void transport_print_push_status(const char *dest, struct
ref *refs,
t
Pushing from a shallow clone using today's send-pack and receive-pack
may work, if the transferred pack does not ends up at any graft
points. If it does, recent receive-pack that does connectivity check
will reject the push. If receive-pack is old, the upstream repo
becomes corrupt.
The pack proto
Signed-off-by: Nguyễn Thái Ngọc Duy
---
commit.h | 3 +++
fetch-pack.c | 53 +
shallow.c| 53 +
3 files changed, 57 insertions(+), 52 deletions(-)
diff --git a/commit.h b/commit.h
in
If either receive-pack or upload-pack is called on a shallow
repository, shallow graft points will be sent after the ref
advertisement (but before the packet flush).
This breaks the protocol for all clients trying to push to a shallow
repo, or fetch from one. Which is basically the same end result
No callers pass a non-empty pointer as shallow_points at this
stage. As a result, all clients still refuse to talk to shallow
repository on the other end.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/fetch-pack.c | 2 +-
builtin/send-pack.c | 2 +-
cache.h | 1 +
connect.c
When send-pack receives "shallow" lines from receive-pack, it knows
the other end does not have a complete commit chains. It restrict
itself to the commits that are not cut out by either end to make sure
the result pack is usuable by receive-pack.
The same technique here, using setup_alternate_sha
upload-pack already advertises all shallow grafts if server repository
is shallow. This information can be used to add more grafts to the
client if the server sends commit chains down to its graft points.
If the server is shallow, before we receive the pack, we setup a
temporary shallow file that
Duy Nguyen writes:
> On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer
> wrote:
>> A partially read index file currently cannot be written to disk. Make
>> sure that never happens, by erroring out when a caller tries to change a
>> partially read index. The caller is responsible for reading t
I'm looking for a specification or guidelines on how a Git client should
integrate with bug tracking systems. For SVN, one can use
bugtraq-properties [1] to specify e.g. the issue tracker URL or how to
parse the bug ID from a commit message. AFAIU, there is nothing
comparable for Git [2]? If that's
Reply to this email: globalloanfu...@aol.com
Are You Financially down? And you need a Loan ? Under a clear and
understandable terms and condition At 3% Contact Us Now With
This Email: globalloanfu...@aol.com
(1):Full Names:..
(2):Country/State:
(3):A
This test fails on Cygwin where the default system configuration does not
support case sensitivity (only case retention), so don't run the test on
such systems.
Signed-off-by: Mark Levedahl
---
t/t6131-pathspec-icase.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t6131-pathsp
On Wed, Jul 17, 2013 at 03:03:14PM +0200, Marc Strapetz wrote:
> I'm looking for a specification or guidelines on how a Git client should
> integrate with bug tracking systems. For SVN, one can use
> bugtraq-properties [1] to specify e.g. the issue tracker URL or how to
> parse the bug ID from a co
On Wed, Jul 17, 2013 at 8:22 PM, Mark Levedahl wrote:
> This test fails on Cygwin where the default system configuration does not
> support case sensitivity (only case retention), so don't run the test on
> such systems.
Yeah. I knew this when I wrote this test but forgot to put the check
in. Tha
The patch 6e8fdc58c786a45d7a63c5edf9c702f1874a7a19 causes StGit to raise
"warnings" (actually: errors) in the event that there are changes staged in
the index and a refresh is performed without specifying either --index or
--force. This is great for preventing an entire class of common mistakes,
bu
I have pondered these items:
On Jul 12, 2013, at 11:48, Junio C Hamano wrote:
Perhaps we should fix it as a preparatory patch (1/2) before the
main "feature addition" patch.
On Jul 12, 2013, at 11:52, Junio C Hamano wrote:
Subject: [PATCH] http.c: fix parsing of
http.sslCertPasswordProtecte
Ramsay Jones writes:
> diff --git a/git-compat-util.h b/git-compat-util.h
> index 9f1eaca..e846e01 100644
> --- a/git-compat-util.h
> +++ b/git-compat-util.h
> @@ -300,6 +300,12 @@ extern char *gitbasename(char *);
> #endif
> #endif
>
> +#if defined(__GNUC__) && !defined(NO_SENTINEL)
> +#defi
This is a resend of v3 because at least one patch was
damaged last time for whatever reason.
Ralf Thielow (3):
l10n: de.po: switch from pure German to German+English (part 1)
l10n: de.po: switch from pure German to German+English (part 2)
l10n: de.po: switch from pure German to German+Englis
Junio C Hamano writes:
> Also do we know what version of GCC started supporting this
> attribute? http://gcc.gnu.org/gcc-4.0/changes.html mentions it in
> "New Languages and Language specific improvements" section, but the
> page also says "The latest release in the 4.0 release series is GCC
> 4
Stefan Beller writes:
> The changes in the following patch are in diff_no_index.c, but the
> diff_no_index(...) is called from cmd_diff, which is in builtin/diff.c
> That cmd_diff is actually called from git.c having the
> { "diff", cmd_diff }, entry in handle_internal_command.
>
> My question no
Dirk Wallenstein writes:
> When an invalid revision is specified, the error message is:
>
> fatal: Needed a single revision
>
> This is misleading because, you might think there is something wrong
> with the command line as a whole.
>
> Now the user gets a more meaningful error message, showi
John Keeping writes:
> On Tue, Jul 09, 2013 at 12:53:27PM -0700, Junio C Hamano wrote:
>> diff --git a/remote.c b/remote.c
>> index 81bc876..e9b423a 100644
>> --- a/remote.c
>> +++ b/remote.c
>> @@ -1938,3 +1938,62 @@ struct ref *get_stale_heads(struct refspec *refs, int
>> ref_count, struct ref
John Keeping writes:
> On Tue, Jul 09, 2013 at 12:53:27PM -0700, Junio C Hamano wrote:
>> diff --git a/remote.c b/remote.c
>> index 81bc876..e9b423a 100644
>> --- a/remote.c
>> +++ b/remote.c
>> @@ -1938,3 +1938,62 @@ struct ref *get_stale_heads(struct refspec *refs, int
>> ref_count, struct ref
"Kyle J. McKay" writes:
> However, upon further consideration (I noticed that the preparatory
> patch and v4 of the textual matching patch made their way into pu),
Do not read too much into being in 'pu'. They are there primarily
so that I won't forget what is in-flight and can be replaced or
d
Currently, when an invalid revision is specified, the error message is:
fatal: Needed a single revision
This is misleading because, you might think there is something wrong
with the command line as a whole.
Now the user gets a more meaningful error message, showing the invalid
revision.
Sig
On Wed, Jul 17, 2013 at 10:04 AM, Junio C Hamano wrote:
> If we wanted to make "-q" follow the spirit of its original addition
> to "show-diff" again, we could internally add a diff-filter when the
> "-q" option is parsed.
Having said all that, I do not mean to advocate to retain "-q". Most
likel
On Jul 17, 2013, at 10:35, Junio C Hamano wrote:
"Kyle J. McKay" writes:
perhaps it would be more convenient for you if I re-released the
following patch series:
If "These build on top of each other in this order", then it is
easier for me to manage if they were in a single series.
Yup. T
Thomas Rast writes:
> Thomas Rast writes:
>
>> From: "Dale R. Worley"
>>
>> open() returns -1 on failure, and indeed 0 is a possible success value
>> if the user closed stdin in our process. Fix the test.
>>
>> Signed-off-by: Thomas Rast
>
> I see you have this in 'pu' without Dale's signoff.
Mark Levedahl writes:
> Subtests 6, 7, and 9 rely test that merge-recursive correctly
> ignores whitespace when so directed. These tests create and test for
> lines ending in \r\n, but as this is a valid line separator on Windows,
> convert such lines in the output to avoid confusion by line-orie
Duy Nguyen writes:
> On Wed, Jul 17, 2013 at 8:22 PM, Mark Levedahl wrote:
>> This test fails on Cygwin where the default system configuration does not
>> support case sensitivity (only case retention), so don't run the test on
>> such systems.
>
> Yeah. I knew this when I wrote this test but fo
Signed-off-by: René Scharfe
---
I failed to log on to the dyn.com website in time and lost my old free
DNS entry. :-/
.mailmap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index 345cce6..5c16adf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -78,7 +78,7 @@ Pet
On 07/17/2013 07:04 PM, Junio C Hamano wrote:
> Builtins link all sorts of stuff from outside, e.g. diff.c and
> diffcore-*.c at the toplevel. I do not see diff_no_index.c is any
> different, so I am probably not understanding your question.
Thanks for the explanation. I am not yet very used to
I got more responses from people regarding the .mailmap file.
All added persons gave permission to add them to the .mailmap file.
Signed-off-by: Stefan Beller
---
.mailmap | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index 9430d14..df8898f 10
Thomas Rast writes:
>> But a 'git grep "corrupt patch for sub"' shows some files in the po
>> directory still containing that string on current master. Shouldn't
>> they be changed too or is this just a sign of me not understanding
>> the translation process?
>
> I haven't checked any guides, but
> -Original Message-
> From: Zane Bitter [mailto:zbit...@redhat.com]
> Sent: Wednesday, July 17, 2013 6:57 AM
> To: git@vger.kernel.org
> Cc: Keller, Jacob E; Waskiewicz Jr, Peter P; catalin.mari...@gmail.com
> Subject: [StGit PATCH] Fix dirty index errors when resolving conflicts
>
> The
On Wed, 2013-07-17 at 15:57 +0200, Zane Bitter wrote:
> The patch 6e8fdc58c786a45d7a63c5edf9c702f1874a7a19 causes StGit to raise
> "warnings" (actually: errors) in the event that there are changes staged in
> the index and a refresh is performed without specifying either --index or
> --force. This
This series fixes a regression in "blame -L X,-N", adds blame -L tests,
and makes minor documentation adjustments. The tests, in particular,
were motivated by the desire to revisit and continue working on [1]
which extends git-blame to accept multiple -L's. That topic will need to
extend blame -L t
git-blame inherited "-L :funcname" support when "-L :funcname:file" was
implemented for git-log. Add tests.
Signed-off-by: Eric Sunshine
---
t/annotate-tests.sh | 48 ++--
1 file changed, 46 insertions(+), 2 deletions(-)
diff --git a/t/annotate-tests.
In particular,
- indent with tabs
- cuddle test description and opening body quote with test_expect_foo
- normalize test descriptions and case
- remove whitepsace following redirection operator
- use standardized filenames (such as "actual", "expected")
Signed-off-by: Eric Sunshine
---
t/annota
Standard practice in Git documentation is for each variation of an
option (such as: -p / --porcelain) to be placed on its own line in the
OPTIONS table. The -L option does not follow suit. It cuddles
"-L ," and "-L :", separated by a comma. This is
inconsistent and potentially confusing since the c
With the exception of a couple "corner case" checks in t8003 (and some
indirect tests in t4211 of -L parsing code shared by log -L), there is
no systematic checking of blame -L. Add tests to check blame -L
directly.
Signed-off-by: Eric Sunshine
---
t/annotate-tests.sh | 104
The ability to omit either end of the -L range is a handy but
undocumented shortcut, and is thus not easily discovered. Fix this
shortcoming.
Signed-off-by: Eric Sunshine
---
Documentation/blame-options.txt | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/
"blame -L X,-N" is documented as blaming "N lines ending at X". In
practice, the behavior is achieved by swapping the two range endpoints
if the second is less than the first. 25ed3412 (Refactor parse_loc;
2013-03-28) broke this interpretation by removing the swapping code from
blame.c and failin
On 07/16/2013 10:53 PM, Philip Oakley wrote:
>
> Does anyone run the "new static checker called 'Stack' that precisely
> identifies unstable code"? [though the paper's conclusion says 'All
> Stack source code will be publicly available.' which suggests it's not
> yet available]
>
So I started us
If we exit early in the function parse_object_buffer, we did not
write to *eaten_p. Then the calling function parse_object, which looks
like the following with respect to the eaten variable, cannot rely on a
proper value set in eaten, hence the freeing of the buffer depends
on random values in memo
Hello Git Developers,
We recently have moved our project from Git to Perforce and those of us
who prefer Git still are using Git p4 to stay in Git land. One of the files in
our repository was renamed while still in Git, but the rename only consisted of
a case change of a character in t
On 07/18/2013 12:08 AM, Stefan Beller wrote:
>
> So I started using the clang code analyzer on git. One of the
> first warnings actually is this:
>
So in case somebody else would also like to play around with the
clang static code analyzer:
# get clang:
cd
git clone http://llvm.org/git/llvm.g
Stefan Beller writes:
> And the parse_object_buffer looks like this with respect to the eaten
> variable:
> struct object *parse_object_buffer(...)
> {
> int eaten = 0;
> if (something)
> return NULL;
> ...
>
Thomas Gummerer writes:
> Ah ok, I understand. I think it's best to add a GIT_INDEX_VERSION=x
> config option to config.mak, where x is the index version that should be
> tested.
Whatever you do, please do not call it GIT_INDEX_VERSION _if_ it is
only to be used while testing. Have string "TES
The --diff-filter= option given by the user is kept as a
string, and passed to the underlying diffcore_apply_filter()
function as a string for each resulting path we run number of
strchr() to see if each class of change among ACDMRTXUB is meant to
be given.
Change the function signature to pass th
The "-q" option given to "git diff-files" is a remnant of the
"show-diff" command, the precursor of today's "git diff-files" (back
then, we didn't even have "git" potty. The user literally typed
"show-diff", not "git show-diff").
ca2a0798 ([PATCH] Add "-q" option to show-diff.c, 2005-04-15) added
We used to accept "git diff --diff-filter=Q" (note that there is no
such change class 'Q') silently and showed no output (because there
is no such change class 'Q').
Error out when such an input is given.
Signed-off-by: Junio C Hamano
---
diff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletio
This reimplements the ancient "-q" option to "git diff-files" that
was inherited from "show-diff -q" in terms of "--diff-filter=d", and
issue a warning against the use of the former.
Incidentally this also tentatively fix "git diff --no-index" to
honor "-q" and hide deletions; the use will get the
In order to express "we do not care about deletions", we had to say
"--diff-filter=ACMRTXUB", giving all the possible change class
except for the one we do not want, "D".
This is cumbersome. As all the change classes are in uppercase,
allow their lowercase counterpart to selectively exclude the c
Instead of running strchr() on the list of status characters over
and over again, parse the --diff-filter option into bitfields and
use the bits to see if the change to the filepair matches the status
requested.
Signed-off-by: Junio C Hamano
---
diff.c | 63 ++
diffcore_apply_filter() checks if a filepair matches the filter
given with the "--diff-filter" option for each input filepairs with
a fairly complex expression in two places.
Create a helper function and call it.
Signed-off-by: Junio C Hamano
---
diff.c | 29 +
1 fil
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/majordomo-info.html
René Scharfe writes:
> Signed-off-by: René Scharfe
> ---
> I failed to log on to the dyn.com website in time and lost my old free
> DNS entry. :-/
Thanks.
Now the real issue is how we verify this patch is from the real René
whose longtime contribution we all appreciate ;-).
>
> .mailmap | 2
Stefan Beller writes:
> I got more responses from people regarding the .mailmap file.
> All added persons gave permission to add them to the .mailmap file.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordo
Michael Haggerty writes:
> If do_one_ref() is called recursively, then the inner call should not
> permanently overwrite the value stored in current_ref by the outer
> call. Aside from the tiny optimization loss, peel_ref() expects the
> value of current_ref not to change across a call to peel_e
Giving this one last kick to make absolutely sure that nobody disagrees
with allowing this code to be included into tig, which does not limit
to a specific version of the GPL (version 2 in the case of git, any
version equal to or newer than 2 in the case of tig), pursuant to
paragraph 9 of said li
Since c7d67ab running "tig" with no options has failed with the
error "tig: No revisions match the given arguments." This was due
to a change in how the arguments for the back-end git call was
being constructed. This change caused the blank field left in
place of "(encoding_arg)" when it is empty t
69 matches
Mail list logo