Re: git-diff passes : args to GIT_EXTERNAL_DIFF incorrectly?

I've figured it out. It's not a bug, it's a peculiarity of pprint(). It splits strings to avoid long lines and abuses the fact that in Python strings split with whitespace are concatenated by the parser. Also, in my example newlines are not parsed correctly in the shell. Escaping them, I get the e

Re: git-diff passes : args to GIT_EXTERNAL_DIFF incorrectly?

On Fri, 30 Aug 2019 at 17:27, Jeff King wrote: > I think you have an extra "old-filename" in the second list. Agreed. My misunderstanding was that I had thought that when documentation said "path", it meant "argv[0], the path to the diff executable". > Interesting. I _don't_ see that splitting w

Re: git-diff passes : args to GIT_EXTERNAL_DIFF incorrectly?

On Fri, 30 Aug 2019 at 13:16, Phillip Wood wrote: > I'm not sure why the last argument is being split in > your example. It is not split in the example below I have replicated the splitting issue on my small demo repo [1]: $ env GIT_EXTERNAL_DIFF=./print_argv.py git diff -M origin/branch1 origin

Re: git-diff passes : args to GIT_EXTERNAL_DIFF incorrectly?

Thank you for the reply. On Thu, 29 Aug 2019 at 06:54, Junio C Hamano wrote: > $ git diff -M branch1 branch2 -- file1 file2 > > if file1 and file2 have similar-enough contents, may have a better > chance of what you wanted to ask Git (if I am guessing what it is, > that is). The context here

Re: git-diff passes : args to GIT_EXTERNAL_DIFF incorrectly?

I have put up a demo repo here: https://github.com/dniku/git-external-diff-argv On Tue, 27 Aug 2019 at 21:24, Dmitry Nikulin wrote: > > I wrote a very simple Python script to see which arguments git-diff > passes to the external diff program when comparing files across > branche

git-diff passes : args to GIT_EXTERNAL_DIFF incorrectly?

I wrote a very simple Python script to see which arguments git-diff passes to the external diff program when comparing files across branches: $ env GIT_EXTERNAL_DIFF=./print_argv.py git diff origin/branch1:file1.txt origin/branch2:file2.txt ['./print_argv.py', 'file1.txt', '/tmp/QRaIJ1_file1.txt

Re: [PATCHv3] send-email: Ask if a patch should be sent twice

Hi Junio, On 7/30/19 11:13 PM, Junio C Hamano wrote: > Dmitry Safonov writes: > >> I was almost certain that git won't let me send the same patch twice, > > Why? And more importantly, does it matter to readers of this > message what you thought? I see the point

[PATCHv4] send-email: Ask if a patch should be sent twice

I was almost certain that git won't let me send the same patch twice, but today I've managed to double-send a directory by a mistake: git send-email --to linux-ker...@vger.kernel.org /tmp/timens/ --cc 'Dmitry Safonov <0x7f454...@gmail.com>' /tmp/ti

Re: [PATCHv3] send-email: Ask if a patch should be sent twice

On 7/30/19 10:10 PM, SZEDER Gábor wrote: > On Tue, Jul 30, 2019 at 09:33:27PM +0100, Dmitry Safonov wrote: >> @@ -589,6 +591,19 @@ test_expect_success $PREREQ 'In-Reply-To with >> --chain-reply-to' ' >> test_cmp expect actual >> ' >>

[PATCHv3] send-email: Ask if a patch should be sent twice

I was almost certain that git won't let me send the same patch twice, but today I've managed to double-send a directory by a mistake: git send-email --to linux-ker...@vger.kernel.org /tmp/timens/ --cc 'Dmitry Safonov <0x7f454...@gmail.com>' /tmp/ti

Re: [PATCHv2] send-email: Ask if a patch should be sent twice

On 7/30/19 8:35 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >> On Tue, Jul 30, 2019 at 05:26:24PM +0100, Dmitry Safonov wrote: >>> + if (@dupes) { >>> + printf(__("Patches specified several times: \n")); >> >> Is this me

[PATCHv2] send-email: Ask if a patch should be sent twice

I was almost certain that git won't let me send the same patch twice, but today I've managed to double-send a directory by a mistake: git send-email --to linux-ker...@vger.kernel.org /tmp/timens/ --cc 'Dmitry Safonov <0x7f454...@gmail.com>' /tmp/ti

Re: [PATCH] send-email: Ask if a patch should be sent twice

On 7/30/19 12:54 PM, Ævar Arnfjörð Bjarmason wrote: > > On Tue, Jul 30 2019, Dmitry Safonov wrote: > >> I was almost certain that git won't let me send the same patch twice, >> but today I've managed to double-send a directory by a mistake: >&g

[PATCH] send-email: Ask if a patch should be sent twice

I was almost certain that git won't let me send the same patch twice, but today I've managed to double-send a directory by a mistake: git send-email --to linux-ker...@vger.kernel.org /tmp/timens/ --cc 'Dmitry Safonov <0x7f454...@gmail.com>' /tmp/ti

Re: prepare-commit-msg hook no longer run for cherry-pick?

On Tue, Jan 9, 2018 at 6:24 PM, Junio C Hamano wrote: > > Dmitry Torokhov writes: > > >> I had prepare-commit-msg hook that would scrub "Patchwork-ID: " tags > >> form commit messages and would update input mailing list patchwork to > >> mark cor

Re: prepare-commit-msg hook no longer run for cherry-pick?

Hi Junio, On Fri, Jan 5, 2018 at 10:48 AM, Dmitry Torokhov wrote: > Hi, > > I had prepare-commit-msg hook that would scrub "Patchwork-ID: " tags > form commit messages and would update input mailing list patchwork to > mark corresponding patches as "accepted&

prepare-commit-msg hook no longer run for cherry-pick?

ws:~/kernel/master (for-linus)$ Also note that the argument to the hook is "merge" whereas I think it used to be "cherry-pick" earlier. Is this behavior intentional? dpkg reports version as 2.16.0~rc0+next. Thanks! -- Dmitry

Re: Bare repository fetch/push race condition

Sorry for misleading subject. It should be "Race condition between pushing to and pushing from a bare repository"

Bare repository fetch/push race condition

It looks like there is a race condition between fetch and push in a bare repository in the following setup. There is a bare git repository on a local file system. Some process pushes to this repository via jgit. There is a cron task which pushes this repository to the backup remote repo over ssh. W

'git submodules update' ignores credential.helper config of the parent repository

I'm checking out a repository in a non-interactive environment and would like to disable interactive credential helpers. According to [1] it can be done by specifying an empty helper in a local config: [credential] helper = But the submodule update command ignores the helper specified in th

Re: [Question] Git histrory after greybus merge

Adding Cc: git list, Junio. 2016-10-26 15:55 GMT+03:00 Dmitry Safonov <0x7f454...@gmail.com>: > Hi, > > Is there any way to specify git-log or git-rev-list which root tree to use? > I mean, I got the following situation: > I saw the commit a67dd266adf4 ("netfilter:

Credential helpers processing order

environment where a system-level GUI helper is configured: clone hangs since system-level helper called first and there is no input from the user. Also if a system-level helper sets quit=true, then lower-level helpers won't be called at all. Is it by design? -- Dmitry -- To unsubscribe from this list:

Re: 'git diff-index' doesn't honor the 'diff.algorithm' variable

vc-diff with unbounded number options, e.g. --no-side-by-side, that will be added to defeat configuration variables that will be invented in the future. Fair enough. Thanks, Dmitry. -- 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

Re: 'git diff-index' doesn't honor the 'diff.algorithm' variable

Hi Junio, On 05/14/2016 09:40 PM, Junio C Hamano wrote: The variable belongs to UI config, meant for Porcelain "git diff", together with things like "diff.color", "diff.context", etc. OK, that makes sense. You might want to fix the man page, though, it says, like the 'git diff' one, "For ins

'git diff-index' doesn't honor the 'diff.algorithm' variable

x27; gives the expected output using the non-default algorithm. 'git diff-index -p HEAD -- test.css' uses the default one. Best regards, Dmitry. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More m

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

it in a future release. I've cherry-picked commit 121061f6 over version 2.4.10 and 2.7.1. In both cases it works exactly as expected. Please, let me know if I can help with something else regarding this issue. 2016-02-21 0:38 GMT+03:00 Junio C Hamano : > Dmitry Vilkov writes: > &g

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

ood solution to this issue? It would be very helpful because now we have to have our own version of patched Git :( Thanks in advance. 2016-02-08 12:11 GMT+03:00 Dmitry Vilkov : > 2016-02-06 0:52 GMT+03:00 Junio C Hamano : >> "brian m. carlson" writes: >> >>>

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

2016-02-06 0:52 GMT+03:00 Junio C Hamano : > "brian m. carlson" writes: > >> On Fri, Feb 05, 2016 at 01:02:58PM -0800, Junio C Hamano wrote: >>> Hmph, so documenting that :@ >>> as a supported way might be an ugly-looking solution to the original >>> problem. A less ugly-looking solution might be

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

2016-02-03 2:29 GMT+03:00 brian m. carlson : > I'm unclear in what case you'd need to have a username and password > combination with GSS-Negotiate. Kerberos doesn't use your password, > although you need some indication of a username (valid or not) to get > libcurl to do authentication. > > Are y

[PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

unconditionally. Although, we haven't tried yet provided credentials for this auth method. Signed-off-by: Dmitry Vilkov --- http.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/http.c b/http.c index 0da9e66..707ea84 100644 --- a/http.c +++ b/http.c @@ -951,12 +9

[PATCH] Fixed typo in Doc/gitrepository-layout

From: LDVSOFT gitrepository-layout.txt: In description of `info' directory, note about `$GIT_COMMON_DIR' was referencing `index' instead of `info'. Signed-off-by: LDVSOFT --- Documentation/gitrepository-layout.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docu

Fwd: Translate Pro Git book to Russian and Ukrainian

Good day! I am Russian and Ukrainian native speaker. I have a little free time and I want to help in translating. What I may do for it? -- 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.

git merge changes file mode from 644 to 755

dafx.cpp 100644 0bf386d4ae494503129921f5b5077a74976c8f91 0 stdafx.cpp - 644 after read-tree -m Why git merge changes mode from 644 to 755? Is it a known issue? I use git version 1.9.5.msysgit.0. Maybe the issue was fixed in a later version? Regards, Dmitry -- To unsubscribe from this list: send the line "unsubscribe g

Re: How do I resolve conflict after popping stash without adding the file to index?

On 04/22/2015 12:29 AM, Jeff King wrote: Hmm, interestingly, if you do _not_ stage the changes (i.e., drop the final "git add" there), you get: $ git stash pop error: Your local changes to the following files would be overwritten by merge: test Please, commit your changes or s

Re: How do I resolve conflict after popping stash without adding the file to index?

On 04/21/2015 12:11 AM, Junio C Hamano wrote: But the said file, if it had conflicted, would have had only the conflicted higher stage entries in the index, no? That is, the failed merge wouldn't have touched the index for the path if it already had changes there in the first place. I'm not r

How do I resolve conflict after popping stash without adding the file to index?

s resolved. What's the proper thing to do there? 'git add file.ext' followed by 'git reset file.ext'? Or simply 'git reset file.ext'? Either will reset already-staged changes from the said file, which is an irreversible operation. Best regards, Dmitry. --

Re: submodule.$name.url is ignored during submodule update

even though 'submodule.$name.url' had a different value. On Thu, Mar 19, 2015 at 2:16 PM, Dmitry Neverov wrote: > I want to use a custom url for both initial submodule clone and > submodule update. Git submodule man page states that if I run 'git > submodule init' and

Re: submodule.$name.url is ignored during submodule update

does use the custom url for initial submodule clone, but doesn't use it when cloned submodule needs to be updated. Is that by design? On Thu, Mar 19, 2015 at 2:09 PM, Doug Kelly wrote: > On Thu, Mar 19, 2015 at 4:27 AM, Dmitry Neverov > wrote: >> Hi, >> >> I've n

submodule.$name.url is ignored during submodule update

Hi, I've noticed that the 'submodule.$name.url' config parameter from the main repository is ignored when a submodule needs to be updated, the submodule's 'remote.origin.url' is used instead. Is there any way to customize the submodule url for both the initial clo

Re: Git gc removes all packs

Thu, Feb 05, 2015 at 04:13:03PM +0100, Dmitry Neverov wrote: > >> I'm using git p4 for synchronization with perforce. Sometimes after 'git >> p4 rebase' git starts a garbage collection. When gc finishes a local >> repository contains no pack files only loose object

Git gc removes all packs

alternate and also added a ref which is a symbolic link to a branch in another repo (so I don't have to do any fetches). How do I troubleshoot the problem? Is there any way to enable a some kind of logging for automatic git gc? Can use of alternates or symbolic links in refs cause such a behavio

Probably a bug with "~" symbol in filenames on Windows 7 x64 in git 1.9.5

ng back to 1.9.4. fixed that problem. Thanks, Dmitry -- 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

Re: Joining historical repository using grafts or replace

Hi Christian, > On Thu, Oct 30, 2014 at 6:41 PM, Dmitry Oksenchuk > wrote: >> 2014-10-30 19:54 GMT+03:00 Christian Couder : >>> >>> This might be a good idea. Did you already test that the small >>> repository is really faster than the full repository? &g

Re: [git] Joining historical repository using grafts or replace

2014-10-30 18:44 GMT+03:00 W. Trevor King : > On Thu, Oct 30, 2014 at 06:39:56PM +0300, Dmitry Oksenchuk wrote: >> We're in the middle of conversion of a large CVS repository (20 >> years, 70K commits, 1K branches, 10K tags) to Git and considering >> two separate Git

Re: Joining historical repository using grafts or replace

Hi Christian, Thanks for your reply. 2014-10-30 19:54 GMT+03:00 Christian Couder : > On Thu, Oct 30, 2014 at 4:39 PM, Dmitry Oksenchuk > wrote: >> We're in the middle of conversion of a large CVS repository (20 years, >> 70K commits, 1K branches, 10K tags) to

Joining historical repository using grafts or replace

ry with branch heads in "historical" repository. Both grafts and replace will be used locally. Grafts is a bit easier to distribute (simple copying, replaces should be created via bash script). Are there any disadvantages of using grafts and replace? Will both of them be supported

"Unexpected end of command stream" message looks irrelevant when I try to pull a non-existing branch

vant - the command is well formed except I perhaps mistyped the branch name. It looks like there's some bug that prevents the program from just exiting after printing the first line and so the second line is being output. Could you please fix this? Thank you. Dmitry. -- -- To unsubscribe from

Re: [PATCH] configure.ac: link with -liconv for locale_charset()

gi/query-pr.cgi?pr=187326#reply3 -- Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D amd...@amdmi3.ru ..: jabber: amd...@jabber.ruhttp://www.amdmi3.ru -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vg

Re: [PATCH] configure.ac: link with -liconv for locale_charset()

here instead of -liconv) > > - git doesn't build due to unresolved external locale_charset() > > > > Fix this by adding -liconv to CHARSET_LIB if locale_charset() is > > detected in this library. > > > > Signed-off-by: Dmitry Marakasov > > --- > &

[PATCH] configure.ac: link with -liconv for locale_charset()

harset() is detected in this library. Signed-off-by: Dmitry Marakasov --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git configure.ac configure.ac index 2f43393..3f5c644 100644 --- configure.ac +++ configure.ac @@ -890,7 +890,7 @@ GIT_CONF_SUBST([HAVE_STRINGS_H

git push first asks for credentials, then checks the branch exists

ord 2. it authenticates on the origin server 3. it bails out with "error: sfc refspec BranchMistypedLongName does not match any" Can't git perhaps check that the branch exists before it asks me for credentials and just say there's no such branch? Could you please fix this?

[PATCH v4 12/14] builtin/mktree.c: use ALLOC_GROW() in append_to_tree()

Helped-by: He Sun Signed-off-by: Dmitry S. Dolzhenko --- builtin/mktree.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/builtin/mktree.c b/builtin/mktree.c index f92ba40..a964d6b 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@ -23,10 +23,7 @@ static void

[PATCH v4 09/14] reflog-walk.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in add_commit_info() and read_one_reflog() Signed-off-by: Dmitry S. Dolzhenko --- reflog-walk.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/reflog-walk.c b/reflog-walk.c index b2fbdb2..2899729 100644 --- a/reflog-walk.c

[PATCH v4 04/14] commit.c: use ALLOC_GROW() in register_commit_graft()

Signed-off-by: Dmitry S. Dolzhenko --- commit.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index 6bf4fe0..e004314 100644 --- a/commit.c +++ b/commit.c @@ -147,12 +147,8 @@ int register_commit_graft(struct commit_graft *graft, int ignore_dups

[PATCH v4 13/14] read-cache.c: use ALLOC_GROW() in add_index_entry()

Signed-off-by: Dmitry S. Dolzhenko --- read-cache.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/read-cache.c b/read-cache.c index fb440b4..cbdf954 100644 --- a/read-cache.c +++ b/read-cache.c @@ -990,11 +990,7 @@ int add_index_entry(struct index_state *istate, struct

[PATCH v4 07/14] patch-ids.c: use ALLOC_GROW() in add_commit()

Signed-off-by: Dmitry S. Dolzhenko --- patch-ids.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/patch-ids.c b/patch-ids.c index bc8a28f..bf81b92 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -83,10 +83,7 @@ static struct patch_id *add_commit(struct commit *commit

[PATCH v4 11/14] attr.c: use ALLOC_GROW() in handle_attr_line()

Signed-off-by: Dmitry S. Dolzhenko --- attr.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/attr.c b/attr.c index 8d13d70..734222d 100644 --- a/attr.c +++ b/attr.c @@ -338,12 +338,7 @@ static void handle_attr_line(struct attr_stack *res, a = parse_attr_line

[PATCH v4 06/14] diffcore-rename.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in locate_rename_dst() and register_rename_src() Signed-off-by: Dmitry S. Dolzhenko --- diffcore-rename.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 9b4f068..fbf3272 100644

[PATCH v4 05/14] diff.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in diffstat_add() and diff_q() Signed-off-by: Dmitry S. Dolzhenko --- diff.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diff.c b/diff.c index e800666..aebdfda 100644 --- a/diff.c +++ b/diff.c @@ -1361,11 +1361,7

[PATCH v4 02/14] bundle.c: use ALLOC_GROW() in add_to_ref_list()

Signed-off-by: Dmitry S. Dolzhenko --- bundle.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bundle.c b/bundle.c index e99065c..1388a3e 100644 --- a/bundle.c +++ b/bundle.c @@ -14,11 +14,7 @@ static const char bundle_signature[] = "# v2 git bundle\n"; s

[PATCH v4 01/14] builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()

Signed-off-by: Dmitry S. Dolzhenko --- builtin/pack-objects.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c733379..0ffad6f 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1213,12 +1213,9

[PATCH v4 14/14] sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()

Helped-by: He Sun Signed-off-by: Dmitry S. Dolzhenko --- sha1_file.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 019628a..3cb17b8 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2624,12 +2624,7 @@ int pretend_sha1_file(void *buf

[PATCH v4 03/14] cache-tree.c: use ALLOC_GROW() in find_subtree()

Signed-off-by: Dmitry S. Dolzhenko --- cache-tree.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 0bbec43..30149d1 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -75,11 +75,7 @@ static struct cache_tree_sub *find_subtree(struct

[PATCH v4 10/14] dir.c: use ALLOC_GROW() in create_simplify()

Signed-off-by: Dmitry S. Dolzhenko --- dir.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dir.c b/dir.c index 98bb50f..4ae38e4 100644 --- a/dir.c +++ b/dir.c @@ -1341,10 +1341,7 @@ static struct path_simplify *create_simplify(const char **pathspec) for (nr

[PATCH v4 08/14] replace_object.c: use ALLOC_GROW() in register_replace_object()

Signed-off-by: Dmitry S. Dolzhenko --- replace_object.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/replace_object.c b/replace_object.c index cdcaf8c..843deef 100644 --- a/replace_object.c +++ b/replace_object.c @@ -36,12 +36,8 @@ static int

[PATCH v4 00/14] Use ALLOC_GROW() instead of inline code

://thread.gmane.org/gmane.comp.version-control.git/242919 [2] http://thread.gmane.org/gmane.comp.version-control.git/242920 Dmitry S. Dolzhenko (14): builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() bundle.c: use ALLOC_GROW() in add_to_ref_list() cache-tree.c: use AL

[PATCH v3 11/11] attr.c: use ALLOC_GROW() in handle_attr_line()

Signed-off-by: Dmitry S. Dolzhenko --- attr.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/attr.c b/attr.c index 8d13d70..734222d 100644 --- a/attr.c +++ b/attr.c @@ -338,12 +338,7 @@ static void handle_attr_line(struct attr_stack *res, a = parse_attr_line

[PATCH v3 10/11] dir.c: use ALLOC_GROW() in create_simplify()

Signed-off-by: Dmitry S. Dolzhenko --- dir.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dir.c b/dir.c index 98bb50f..4ae38e4 100644 --- a/dir.c +++ b/dir.c @@ -1341,10 +1341,7 @@ static struct path_simplify *create_simplify(const char **pathspec) for (nr

[PATCH v3 09/11] reflog-walk.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in add_commit_info() and read_one_reflog() Signed-off-by: Dmitry S. Dolzhenko --- reflog-walk.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/reflog-walk.c b/reflog-walk.c index b2fbdb2..2899729 100644 --- a/reflog-walk.c

[PATCH v3 08/11] replace_object.c: use ALLOC_GROW() in register_replace_object()

Signed-off-by: Dmitry S. Dolzhenko --- replace_object.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/replace_object.c b/replace_object.c index cdcaf8c..843deef 100644 --- a/replace_object.c +++ b/replace_object.c @@ -36,12 +36,8 @@ static int

[PATCH v3 07/11] patch-ids.c: use ALLOC_GROW() in add_commit()

Signed-off-by: Dmitry S. Dolzhenko --- patch-ids.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/patch-ids.c b/patch-ids.c index bc8a28f..bf81b92 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -83,10 +83,7 @@ static struct patch_id *add_commit(struct commit *commit

[PATCH v3 06/11] diffcore-rename.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in locate_rename_dst() and register_rename_src() Signed-off-by: Dmitry S. Dolzhenko --- diffcore-rename.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 9b4f068..fbf3272 100644

[PATCH v3 05/11] diff.c: use ALLOC_GROW()

Use ALLOC_GROW() instead inline code in diffstat_add() and diff_q() Signed-off-by: Dmitry S. Dolzhenko --- diff.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diff.c b/diff.c index e800666..aebdfda 100644 --- a/diff.c +++ b/diff.c @@ -1361,11 +1361,7

[PATCH v3 03/11] cache-tree.c: use ALLOC_GROW() in find_subtree()

Signed-off-by: Dmitry S. Dolzhenko --- cache-tree.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 0bbec43..30149d1 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -75,11 +75,7 @@ static struct cache_tree_sub *find_subtree(struct

[PATCH v3 04/11] commit.c: use ALLOC_GROW() in register_commit_graft()

Signed-off-by: Dmitry S. Dolzhenko --- commit.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index 6bf4fe0..e004314 100644 --- a/commit.c +++ b/commit.c @@ -147,12 +147,8 @@ int register_commit_graft(struct commit_graft *graft, int ignore_dups

[PATCH v3 02/11] bundle.c: use ALLOC_GROW() in add_to_ref_list()

Signed-off-by: Dmitry S. Dolzhenko --- bundle.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bundle.c b/bundle.c index e99065c..1388a3e 100644 --- a/bundle.c +++ b/bundle.c @@ -14,11 +14,7 @@ static const char bundle_signature[] = "# v2 git bundle\n"; s

[PATCH v3 01/11] builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()

Signed-off-by: Dmitry S. Dolzhenko --- builtin/pack-objects.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c733379..0ffad6f 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1213,12 +1213,9

[PATCH v3 00/11] Use ALLOC_GROW() instead of inline code

Dmitry S. Dolzhenko (11): builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path() bundle.c: use ALLOC_GROW() in add_to_ref_list() cache-tree.c: use ALLOC_GROW() in find_subtree() commit.c: use ALLOC_GROW() in register_commit_graft() diff.c: use ALLOC_GROW() diffcore-rename.c

Re: [PATCH v2 00/11] Use ALLOC_GROW() instead of inline code

Michael, On 28.02.2014 18:38, Michael Haggerty wrote: > Everything looks fine to me. Assuming the test suite ran 100%, > > Acked-by: Michael Haggerty All tests passed successfully for this patch, at least on my machine. Can I do something else to improve this patch? -- To unsubscribe from this

[PATCH v2 11/11] attr.c: change handle_attr_line() to use ALLOC_GROW()

Signed-off-by: Dmitry S. Dolzhenko --- attr.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/attr.c b/attr.c index 8d13d70..734222d 100644 --- a/attr.c +++ b/attr.c @@ -338,12 +338,7 @@ static void handle_attr_line(struct attr_stack *res, a = parse_attr_line

[PATCH v2 10/11] dir.c: change create_simplify() to use ALLOC_GROW()

Signed-off-by: Dmitry S. Dolzhenko --- dir.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dir.c b/dir.c index 98bb50f..4ae38e4 100644 --- a/dir.c +++ b/dir.c @@ -1341,10 +1341,7 @@ static struct path_simplify *create_simplify(const char **pathspec) for (nr

[PATCH v2 09/11] reflog-walk.c: use ALLOC_GROW() instead of inline code

Affected functions: read_one_reflog(), add_commit_info() Signed-off-by: Dmitry S. Dolzhenko --- reflog-walk.c | 13 +++-- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/reflog-walk.c b/reflog-walk.c index b2fbdb2..879d2ed 100644 --- a/reflog-walk.c +++ b/reflog-walk.c

[PATCH v2 08/11] replace_object.c: change register_replace_object() to use ALLOC_GROW()

Signed-off-by: Dmitry S. Dolzhenko --- replace_object.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/replace_object.c b/replace_object.c index cdcaf8c..843deef 100644 --- a/replace_object.c +++ b/replace_object.c @@ -36,12 +36,8 @@ static int

[PATCH v2 07/11] patch-ids.c: change add_commit() to use ALLOC_GROW()

Signed-off-by: Dmitry S. Dolzhenko --- patch-ids.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/patch-ids.c b/patch-ids.c index bc8a28f..bf81b92 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -83,10 +83,7 @@ static struct patch_id *add_commit(struct commit *commit

[PATCH v2 06/11] diffcore-rename.c: use ALLOC_GROW() instead of inline code

Affected functions: locate_rename_dst(), register_rename_src() Signed-off-by: Dmitry S. Dolzhenko --- diffcore-rename.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 9b4f068..fbf3272 100644 --- a/diffcore-rename.c

[PATCH v2 05/11] diff.c: use ALLOC_GROW() instead of inline code

Signed-off-by: Dmitry S. Dolzhenko --- diff.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/diff.c b/diff.c index e800666..aebdfda 100644 --- a/diff.c +++ b/diff.c @@ -1361,11 +1361,7 @@ static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat

[PATCH v2 04/11] commit.c: change register_commit_graft() to use ALLOC_GROW()

Signed-off-by: Dmitry S. Dolzhenko --- commit.c | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/commit.c b/commit.c index 6bf4fe0..e004314 100644 --- a/commit.c +++ b/commit.c @@ -147,12 +147,8 @@ int register_commit_graft(struct commit_graft *graft, int ignore_dups

[PATCH v2 03/11] cache-tree.c: change find_subtree() to use ALLOC_GROW()

Signed-off-by: Dmitry S. Dolzhenko --- cache-tree.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cache-tree.c b/cache-tree.c index 0bbec43..30149d1 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -75,11 +75,7 @@ static struct cache_tree_sub *find_subtree(struct

[PATCH v2 02/11] bundle.c: change add_to_ref_list() to use ALLOC_GROW()

Signed-off-by: Dmitry S. Dolzhenko --- bundle.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/bundle.c b/bundle.c index e99065c..1388a3e 100644 --- a/bundle.c +++ b/bundle.c @@ -14,11 +14,7 @@ static const char bundle_signature[] = "# v2 git bundle\n"; s

[PATCH v2 01/11] builtin/pack-objects.c: change check_pbase_path() to use ALLOC_GROW()

Signed-off-by: Dmitry S. Dolzhenko --- builtin/pack-objects.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index c733379..56a6fc8 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1213,12 +1213,7

[PATCH v2 00/11] Use ALLOC_GROW() instead of inline code

Thank you for your remarks. In this patch I tried to take them into account. Dmitry S. Dolzhenko (11): builtin/pack-objects.c: change check_pbase_path() to use ALLOC_GROW() bundle.c: change add_to_ref_list() to use ALLOC_GROW() cache-tree.c: change find_subtree() to use ALLOC_GROW

[PATCH] Use ALLOC_GROW() instead of inline code

Signed-off-by: Dmitry S. Dolzhenko --- attr.c | 7 +-- builtin/pack-objects.c | 7 +-- bundle.c | 6 +- cache-tree.c | 6 +- commit.c | 8 ++-- diff.c | 12 ++-- diffcore-rename.c | 12

[PATCH v2] branch: change install_branch_config() to use skip_prefix()

Change install_branch_config() to use skip_prefix() for getting the short name of the remote branch. Signed-off-by: Dmitry S. Dolzhenko --- branch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branch.c b/branch.c index 723a36b..9382e02 100644 --- a/branch.c +++ b

Re: [PATCH] branch: change install_branch_config() to use skip_prefix()

Michael, Thank you for your remarks. > If you look at what skip_prefix() and starts_with() do, I think you will > find that you are doing too much work here. How about this one? const char *shortname = skip_prefix(remote, "refs/heads/"); int remote_is_branch = shortname != NULL;

[PATCH] branch: change install_branch_config() to use skip_prefix()

Change install_branch_config() function to use skip_prefix() for getting short name of remote branch. Signed-off-by: Dmitry S. Dolzhenko --- branch.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/branch.c b/branch.c index 723a36b..310749b 100644 --- a/branch.c +++ b

Re: [PATCH] commit.c: use the generic "sha1_pos" function for lookup sha1

Thank you for your remarks. I'll try to fix my patch and send it again. -- 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

[PATCH v2] commit.c: use the generic "sha1_pos" function for lookup

Refactor binary search in "commit_graft_pos" function: use generic "sha1_pos" function. Signed-off-by: Dmitry S. Dolzhenko --- commit.c | 24 +--- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/commit.c b/commit.c index 6bf4fe0..6ceee6a 1

[PATCH] commit.c: use the generic "sha1_pos" function for lookup sha1

Refactor binary search in "commit_graft_pos" function: use generic "sha1_pos" function. Signed-off-by: Dmitry S. Dolzhenko --- commit.c | 24 +--- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/commit.c b/commit.c index 6bf4fe0..8edaeb7 1

Re: Git in GSoC 2014

Hi. I was just going to write an email about that I would like to participate in GSoC and contribute to Git project. I don't have wide experience in C programming, but I could be start as a "janitor". I found several tasks here https://git.wiki.kernel.org/index.php/Janitor. For example "Refa

Re: [PATCH 1/2] init-db.c: honor case on case preserving fs

there, though it may affect it indirectly through some functions that it uses. AFAIK, fast-import does not rely on the filesystem, it should always work with ignorecase=false. Dmitry -- 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

  1   2   >