Johannes Sixt viscovery.net> writes:
>
> Am 2/6/2014 12:54, schrieb konstunn ngs.ru:
> > However I typed the checkout directory in file
> > ..git/info/sparse-checkout by using different formats with
> > and without the leading and the trailing slashes, with and
> > without asterisk after traili
When displaying a blob in gitweb, if it's an image, specify constraints for
maximum display width and height to prevent the image from overflowing the
frame of the enclosing page_body div.
This change assumes that it is more desirable to see the whole image without
scrolling (new behavior) than it
On Fri, Feb 7, 2014 at 2:16 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> In smart http, upload-pack adds new shallow lines at the beginning of
>> each rpc response. Only shallow lines from the first rpc call are
>> useful. After that they are thrown away. It's designed this way
On Fri, Feb 7, 2014 at 2:31 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Reported by Jeff [1]. Junio spotted it right but nobody made any move
>> since then.
>
> Hrm. Was I supposed to make any move at that point? The discussion
> ended by me asking a question "what happens if
Christian Couder writes:
> Signed-off-by: Christian Couder
> ---
> trailer.c | 30 +-
> 1 file changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/trailer.c b/trailer.c
> index 98187fc..b5de616 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -1,5 +1,6 @@
> #in
Christian Couder writes:
> Signed-off-by: Christian Couder
> ---
> trailer.c | 30 +-
> 1 file changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/trailer.c b/trailer.c
> index 98187fc..b5de616 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -1,5 +1,6 @@
> #in
Christian Couder writes:
> +#define TRAILER_ARG_STRING "$ARG"
No need to support users who may want to use a string that happens
to match this substring literally as part of the command line?
> struct trailer_item {
> struct trailer_item *previous;
> struct trailer_item *next;
> @@
Christian Couder writes:
> It is simpler and more natural if the "git interpret-trailers"
> is made a filter as its output already goes to sdtout.
sdtout?
Why isn't this a pure filter without any "infile" parameter in the
first place?
> Signed-off-by: Christian Couder
> ---
> builtin/interpr
Christian Couder writes:
> +
> +cat >basic_message <<'EOF'
> +subject
> +
> +body
> +EOF
> +
> +cat >complex_message_body <<'EOF'
> +my subject
> +
> +my body which is long
> +and contains some special
> +chars like : = ? !
> +
> +EOF
> +
> +# We want one trailing space at the end of each line.
>
Christian Couder writes:
> diff --git a/git.c b/git.c
> index 3799514..1420b58 100644
> --- a/git.c
> +++ b/git.c
> @@ -383,6 +383,7 @@ static void handle_internal_command(int argc, const char
> **argv)
> { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
> { "init",
Christian Couder writes:
> This patch parses the trailer command line arguments
> and put the result into an arg_tok doubly linked
> list.
No the patch doesn't parse anything ;-).
"Parse the command line arguments and ...".
> +static void parse_trailer(struct strbuf *tok, struct strbuf *val, c
Christian Couder writes:
> This patch implements the logic that process trailers
> from file and arguments.
>
> At the beginning trailers from file are in their own
> infile_tok doubly linked list, and trailers from
> arguments are in their own arg_tok doubly linked list.
>
> The lists are traver
Christian Couder writes:
> + enum action_if_exist if_exist;
> + enum action_if_missing if_missing;
Probably "if_exists" is more gramatically correct.
if (x->if_exists) {
... do this ...
}
would read well, but not "x->if_exist".
--
To unsu
Christian Couder writes:
> We will use a doubly linked list to store all information
> about trailers and their configuration.
>
> This way we can easily remove or add trailers to or from
> trailer lists while traversing the lists in either direction.
>
> Signed-off-by: Christian Couder
> ---
>
Christian Couder writes:
> It is simpler and more natural if the "git interpret-trailers"
> is made a filter as its output already goes to sdtout.
sdtout???
>
> Signed-off-by: Christian Couder
> ---
> builtin/interpret-trailers.c | 2 +-
> t/t7513-interpret-trailers.sh | 7 +++
> trail
Thomas Rast writes:
> Kirill Smelkov writes:
>
>> Since diff_tree_sha1() can now accept empty trees via NULL sha1, we
>> could just call it without manually reading trees into tree_desc and
>> duplicating code.
>>
>> Cc: Thomas Rast
>> Signed-off-by: Kirill Smelkov
>> ---
>> line-log.c | 26 +
Jonathan Nieder writes:
> For a while I've been wanting to teach GIT_SKIP_TESTS not to skip
> tests with 'setup' or 'set up' in their name, but I never got around
> to it.
Yeah, that would be a good thing. As part of doing so, we might
want to come up with a way to test the tests, randomly skip
Kirill Smelkov writes:
> Since diff_tree_sha1() can now accept empty trees via NULL sha1, we
> could just call it without manually reading trees into tree_desc and
> duplicating code.
>
> Cc: Thomas Rast
> Signed-off-by: Kirill Smelkov
> ---
> line-log.c | 26 ++
> 1 fi
Jonathan Nieder writes:
> Someone asked in a private reply how this interacts with t0003.
It was me mistakenly using "reply" not "reply all".
> t0003 tries check-attr in a bare repository. The question is, is that
> a desirable feature, and are people relying on it?
Running tar-tree from a pu
Jonathan Nieder writes:
> Junio C Hamano wrote:
>
>> Moving to some other directory and letting the remainder of the test
>> pieces to expect that they start there is a bad practice.
>
> I agree with the above, and I like the patch...
>
>>
Junio C Hamano wrote:
> Jonathan Nieder writes:
>>>The test
>>> that contains chdir itself may fail (or by mistake skipped via the
>>> GIT_SKIP_TESTS mechanism) in which case the remainder may operate on
>>> files in unexpected places.
>
This patch parses the trailer command line arguments
and put the result into an arg_tok doubly linked
list.
Signed-off-by: Christian Couder
---
trailer.c | 84 +++
1 file changed, 84 insertions(+)
diff --git a/trailer.c b/trailer.c
ind
Signed-off-by: Christian Couder
---
trailer.c | 63 +++
1 file changed, 63 insertions(+)
diff --git a/trailer.c b/trailer.c
index 108e104..98187fc 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "run
This patch reads trailers from an input file, parses
them and puts the result into a doubly linked list.
Signed-off-by: Christian Couder
---
trailer.c | 71 +++
1 file changed, 71 insertions(+)
diff --git a/trailer.c b/trailer.c
index
This patch implements the logic that process trailers
from file and arguments.
At the beginning trailers from file are in their own
infile_tok doubly linked list, and trailers from
arguments are in their own arg_tok doubly linked list.
The lists are traversed and when an arg_tok should be
"applie
It is simpler and more natural if the "git interpret-trailers"
is made a filter as its output already goes to sdtout.
Signed-off-by: Christian Couder
---
builtin/interpret-trailers.c | 2 +-
t/t7513-interpret-trailers.sh | 7 +++
trailer.c | 15 +--
3 files
We will use a doubly linked list to store all information
about trailers and their configuration.
This way we can easily remove or add trailers to or from
trailer lists while traversing the lists in either direction.
Signed-off-by: Christian Couder
---
Makefile | 1 +
trailer.c | 48 +
Signed-off-by: Christian Couder
---
trailer.c | 30 +-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/trailer.c b/trailer.c
index 98187fc..b5de616 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "run-command.h"
+#incl
Signed-off-by: Christian Couder
---
t/t7513-interpret-trailers.sh | 20
1 file changed, 20 insertions(+)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 2d50b7a..00894a8 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trail
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
---
.gitignore | 1 +
Makefile | 1 +
builtin.h| 1 +
builtin/interp
Signed-off-by: Christian Couder
---
Documentation/git-interpret-trailers.txt | 132 +++
1 file changed, 132 insertions(+)
create mode 100644 Documentation/git-interpret-trailers.txt
diff --git a/Documentation/git-interpret-trailers.txt
b/Documentation/git-interpret-
This patch implements reading the configuration
to get trailer information, and then processing
it and storing it in a doubly linked list.
The config information is stored in the list
whose first item is pointed to by:
static struct trailer_item *first_conf_item;
Signed-off-by: Christian Couder
Signed-off-by: Christian Couder
---
t/t7513-interpret-trailers.sh | 27 +++
1 file changed, 27 insertions(+)
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index f5ef81f..2d50b7a 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpre
Signed-off-by: Christian Couder
---
t/t7513-interpret-trailers.sh | 208 ++
1 file changed, 208 insertions(+)
create mode 100755 t/t7513-interpret-trailers.sh
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
new file mode 100755
This patch series implements a new command:
git interpret-trailers
and an infrastructure to process trailers that can be reused,
for example in "commit.c".
1) Rationale:
This command should help with RFC 822 style headers, called
"trailers", that are found at the end of commit messages.
This patch adds the process_trailers() function that
calls all the previously added processing functions
and then prints the results on the standard output.
Signed-off-by: Christian Couder
---
trailer.c | 40
1 file changed, 40 insertions(+)
diff --git a
Hi again,
Jonathan Nieder wrote:
> Junio C Hamano wrote:
>> +if (!is_bare_repository())
>> +setup_work_tree();
>
> Hm. Shouldn't check-attr error out when run without a worktree and
> without --cached?
>
> That would mean something like
>
> diff --git i/builtin/check-attr.c w/b
From: Eric Sunshine
>
> On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder
> wrote:
>> It is simpler and more natural if the "git interpret-trailers"
>> is made a filter as its output already goes to sdtout.
>>
>> Signed-off-by: Christian Couder
>> ---
>> diff --git a/trailer.c b/trailer.c
>> ind
From: Eric Sunshine
>
> On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder
> wrote:
>> diff --git a/trailer.h b/trailer.h
>> new file mode 100644
>> index 000..9db4459
>> --- /dev/null
>> +++ b/trailer.h
>> @@ -0,0 +1,6 @@
>> +#ifndef TRAILER_H
>> +#define TRAILER_H
>> +
>> +void process_trail
GitDev -
During a rebase of a feature branch to the master branch, I lost a new
file in a new directory. I was able to recover by replaying the
rebase and taking exceptional actions. However, I'm left with the
impression the git does not handle new files properly under some
rebase situations an
Hi,
Junio C Hamano wrote:
> --- a/builtin/check-attr.c
> +++ b/builtin/check-attr.c
> @@ -94,6 +94,9 @@ int cmd_check_attr(int argc, const char **argv, const char
> *prefix)
> struct git_attr_check *check;
> int cnt, i, doubledash, filei;
>
> + if (!is_bare_repository())
> +
Junio C Hamano wrote:
> Moving to some other directory and letting the remainder of the test
> pieces to expect that they start there is a bad practice.
I agree with the above, and I like the patch...
>The test
> that contains chdir its
On Thu, Feb 06, 2014 at 11:31:02AM -0800, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
> > Reported by Jeff [1]. Junio spotted it right but nobody made any move
> > since then.
>
> Hrm. Was I supposed to make any move at that point? The discussion
> ended by me asking a question "w
On Thu, Feb 06, 2014 at 10:10:39PM +0700, Nguyễn Thái Ngọc Duy wrote:
> In smart http, upload-pack adds new shallow lines at the beginning of
> each rpc response. Only shallow lines from the first rpc call are
> useful. After that they are thrown away. It's designed this way
> because upload-pack
On Thu, Feb 06, 2014 at 10:10:38PM +0700, Nguyễn Thái Ngọc Duy wrote:
> See 3e63b21 (upload-pack: Implement no-done capability - 2011-03-14)
> and 761ecf0 (fetch-pack: Implement no-done capability - 2011-03-14)
> for more information.
Content looks good. A few minor grammar nits:
> +no-done
> +-
On Thu, Feb 6, 2014 at 10:10 AM, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
> index b0fa738..fb11073 100755
> --- a/t/t5537-fetch-shallow.sh
> +++ b/t/t5537-fetch-shallow.sh
> @@ -200,5 +200,29 @@ EOF
> )
> '
>
> +# This test is tricky.
On Thu, Feb 06, 2014 at 10:10:35PM +0700, Nguyễn Thái Ngọc Duy wrote:
> Originally I had t5537 use port 5536 and 5538 use port 5537(!). Then
> Jeff found my fault so I changed port in t5537 from 5536 to 5537 in
> 3b32a7c (t5537: fix incorrect expectation in test case 10 -
> 2014-01-08). Which make
On Thu, Feb 06, 2014 at 10:10:34PM +0700, Nguyễn Thái Ngọc Duy wrote:
> Make clear which one is for dumb protocol, which one is for smart from
> their file name.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
Yay. This has often bugged me, and I can't believe we went this long
without fixing it.
-Pef
Nguyễn Thái Ngọc Duy writes:
> Reported by Jeff [1]. Junio spotted it right but nobody made any move
> since then.
Hrm. Was I supposed to make any move at that point? The discussion
ended by me asking a question "what happens if we did X?" and there
was no discussion.
> The main fix is 6/6.
Nguyễn Thái Ngọc Duy writes:
> In smart http, upload-pack adds new shallow lines at the beginning of
> each rpc response. Only shallow lines from the first rpc call are
> useful. After that they are thrown away. It's designed this way
> because upload-pack is stateless and has no idea when its s
Nguyễn Thái Ngọc Duy writes:
> See 3e63b21 (upload-pack: Implement no-done capability - 2011-03-14)
> and 761ecf0 (fetch-pack: Implement no-done capability - 2011-03-14)
> for more information.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> Documentation/technical/protocol-capabilities.txt |
Nguyễn Thái Ngọc Duy writes:
> It's introduced in 1bd8c8f (git-upload-pack: Support the multi_ack
> protocol - 2005-10-28) but probably better documented in the commit
> message of 78affc4 (Add multi_ack_detailed capability to
> fetch-pack/upload-pack - 2009-10-30)
>
> Signed-off-by: Nguyễn Thái
Lasse Makholm noticed that running "git check-attr" from a place
totally unrelated to $GIT_DIR and $GIT_WORK_TREE does not give
expected results. I think it is because the command does not say it
wants to call setup_work_tree().
We still need to support use cases where only a bare repository is
i
Moving to some other directory and letting the remainder of the test
pieces to expect that they start there is a bad practice. The test
that contains chdir itself may fail (or by mistake skipped via the
GIT_SKIP_TESTS mechanism) in which case the remainder may operate on
files in unexpected places
Hello,
I'm using git-remote-bzr to access the GNU Emacs Bazaar repo. I followed the
guideline described here:
https://lists.gnu.org/archive/html/emacs-devel/2013-05/msg8.html
Pulling and pushing worked flawless for several month. But recently git
bzr stopped working with the following err
--
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
Lasse Makholm writes:
> Here's a repro with -DDEBUG_ATTR=1 and a printf() in read_attr_from_file():
>
> $ cd /tmp/
> $ mkdir -p attr-test/repo
> $ cd attr-test/repo
> $ git init
> Initialized empty Git repository in /tmp/attr-test/repo/.git/
> $ echo 'dir/* filter=foo' >.gitattributes
> $
>
> Ins
I've built/installed git from src,
git --version
git version 1.9.rc2.15.g89ba81d
& installed/sourced
/etc/bash_completion.d/git-completion.bash
For all git-core builtins, autocompletion works.
I've also installed contrib/subtree
`git subtree` works, but I get no autocompletion for the co
On Wed, Feb 05, 2014 at 02:58:36PM -0800, Junio C Hamano wrote:
> Kirill Smelkov writes:
>
> > On Wed, Feb 05, 2014 at 11:42:41AM -0800, Junio C Hamano wrote:
> >> Kirill Smelkov writes:
> >>
> >> > I agree object data should be immutable for good. The only thing I'm
> >> > talking
> >> > abou
Vincent van Ravesteijn writes:
> The commits that are in the log for master and which are not in the
> log for originssh/master are merged in at "6833fd4 (HEAD, master);
> Completed merge".
>
> As "git log" can only present the commits in a linear way, it shows
> the commits from the ancentry of
On Thu, Feb 6, 2014 at 3:02 PM, Francis Stephens
wrote:
>
> My co-worker has an inconsistent git log output. Please see that
> attached files for output (I've made a best effort to remove
> confidential info from them).
>
> Comparing the two log commands we can see that master and
> originssh/mast
See 3e63b21 (upload-pack: Implement no-done capability - 2011-03-14)
and 761ecf0 (fetch-pack: Implement no-done capability - 2011-03-14)
for more information.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/technical/protocol-capabilities.txt | 12
1 file changed, 12 insertion
In smart http, upload-pack adds new shallow lines at the beginning of
each rpc response. Only shallow lines from the first rpc call are
useful. After that they are thrown away. It's designed this way
because upload-pack is stateless and has no idea when its shallow
lines are helpful or not.
So aft
pack-protocol.txt explains in detail how multi_ack_detailed works and
what's the difference between no multi_ack, multi_ack and
multi_ack_detailed. No need to repeat here.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/technical/protocol-capabilities.txt | 6 ++
1 file changed, 6 inse
It's introduced in 1bd8c8f (git-upload-pack: Support the multi_ack
protocol - 2005-10-28) but probably better documented in the commit
message of 78affc4 (Add multi_ack_detailed capability to
fetch-pack/upload-pack - 2009-10-30)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/technical/pac
Make clear which one is for dumb protocol, which one is for smart from
their file name.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/{t5540-http-push.sh => t5540-http-push-webdav.sh} | 0
t/{t5541-http-push.sh => t5541-http-push-smart.sh} | 0
t/{t5550-http-fetch.sh => t5550-http-fetch-dumb.sh}
Originally I had t5537 use port 5536 and 5538 use port 5537(!). Then
Jeff found my fault so I changed port in t5537 from 5536 to 5537 in
3b32a7c (t5537: fix incorrect expectation in test case 10 -
2014-01-08). Which makes it worse because now both t5537 and t5538
both use the same port. Fix it.
Si
Reported by Jeff [1]. Junio spotted it right but nobody made any move
since then. The main fix is 6/6. The rest is just updates while I was
looking at it. 2/6 may need fast track though.
[1] http://thread.gmane.org/gmane.comp.version-control.git/219914
Nguyễn Thái Ngọc Duy (6):
test: rename htt
My co-worker has an inconsistent git log output. Please see that
attached files for output (I've made a best effort to remove
confidential info from them).
Comparing the two log commands we can see that master and
originssh/master have a shared common commit at
(4 hours ago) d85832d
More p
On Thu, Feb 6, 2014 at 8:20 PM, Johannes Sixt wrote:
> Am 2/6/2014 12:54, schrieb konst...@ngs.ru:
>> However I typed the checkout directory in file
>> ..git/info/sparse-checkout by using different formats with
>> and without the leading and the trailing slashes, with and
>> without asterisk after
Am 2/6/2014 12:54, schrieb konst...@ngs.ru:
> However I typed the checkout directory in file
> ..git/info/sparse-checkout by using different formats with
> and without the leading and the trailing slashes, with and
> without asterisk after trailing slash, having tried all
> the possible combination
Hi,
It seems that code in attr.c does not honor the current work tree path
(set by e.g. --work-tree ...) and simply always assumes CWD. When the
current dir is not in the work tree, git will attempt to find
.gitattributes under ./ instead of under the correct work tree.
Here's a repro with -DDEBU
(Digging back an old topic after Jeff mentioned it)
On Thu, May 9, 2013 at 2:12 AM, Junio C Hamano wrote:
> Jeff King writes:
>
>> I'm trying to track down a protocol bug that happens with shallow clones
>> over smart-http. As far as I can tell, the bug has existed in all
>> versions.
>>
>> You
On Wed, Feb 5, 2014 at 1:55 PM, Michael Haggerty wrote:
> * Duy seemed to offer to rewrite his patch series, but I don't think
> that it has happened yet.
It's really low in my todo list. So if you want to pick it up, please do.
--
Duy
--
To unsubscribe from this list: send the line "unsubscri
Greetings.
I've tried to perform a single simple task to fetch data
from the linux-next integration testing tree repo and
sparse checkout the "drivers/staging/usbip/" directory.
I managed to perform it successfully under Linux with Git
1.7.1.
But I always failed to perform checkout under Window
Junio C Hamano writes:
> David Kastrup writes:
>
>> It's snake oil making debugging harder.
>
> OK, that is a sensible argument.
>
>>> This was fun ;-)
>>
>> At the expense of seriously impacting my motivation to do any further
>> code cleanup on Git.
>
> Well, I said it was "fun" because I was
Christian Couder writes:
> I would be interested in mentoring a GSoC student working on the "git
> bisect fix/unfixed" feature.
Interestingly, I used the feature in real-life last week, and had to
think upside-down to type the right "good"/"bad" keywords ;-).
> Some of Matthieu's students worke
On Wed, Feb 5, 2014 at 11:57 PM, Jeff King wrote:
>
> On a similar note, the GSoC application deadline is Feb 14th. I am
> happy to be admin again and put together the application, but we will
> need an idea page. I'll set up a page to collect them, but in the
> meantime, please dump any ideas/dis
On Wed, Feb 5, 2014 at 12:50 PM, Jeff King wrote:
> It's a common pattern in our Makefile to echo some make
> variables into a file, but only if they are different from a
> previous run. This sentinel file can then be used as a
> dependency to trigger rebuilds when the make variable
> changes.
>
>
79 matches
Mail list logo
