Re: Want to do some cleanups in this round of l10n

> Or please consult Hello Junio, Can you put future release dates in the gitcal or is there a steady pattern like every Friday - new branch release, every Monday - stable branch release. Kind regards: al_shopov -- To unsubscribe from this list: send the line "unsubscr

Re: git gc --aggressive led to about 40 times slower "git log --raw"

On Wed, Feb 19, 2014 at 7:10 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Lower depth than default (50) does not sound "aggressive" to me, at >> least from disk space utilization. I agree it should be configurable >> though. > > Do you mean you want to keep "--aggressive" to mean "too aggr

Re: [PATCH 2/3] test-lib: allow setting the index format version

Thomas Gummerer writes: > Allow adding a TEST_GIT_INDEX_VERSION variable to config.mak to set the > index version with which the test suite should be run. > ... > diff --git a/Makefile b/Makefile > index 287e6f8..c98d28f 100644 > --- a/Makefile > +++ b/Makefile > @@ -342,6 +342,10 @@ all:: > # D

Re: [PATCH 1/3] introduce GIT_INDEX_VERSION environment variable

Thomas Gummerer writes: > diff --git a/Documentation/git.txt b/Documentation/git.txt > index aec3726..bc9eeea 100644 > --- a/Documentation/git.txt > +++ b/Documentation/git.txt > @@ -712,6 +712,11 @@ Git so take care if using Cogito etc. > index file. If not specified, the default of `$GIT_

Re: [PATCH] rev-parse: fix --resolve-git-dir argument handling

Junio C Hamano writes: > John Keeping writes: > >> There are two problems here: >> >> 1) If no argument is provided, then the command segfaults >> 2) The argument is not consumed, so there will be excess output >> >> Fix both of these in one go by restructuring the handler for this >> option. >>

Re: git gc --aggressive led to about 40 times slower "git log --raw"

Duy Nguyen writes: > Lower depth than default (50) does not sound "aggressive" to me, at > least from disk space utilization. I agree it should be configurable > though. Do you mean you want to keep "--aggressive" to mean "too aggressive in resulting size, to the point that it is not useful to a

Re: [PATCH 5/5] streaming: simplify attaching a filter

Junio C Hamano writes: > John Keeping writes: > >> We are guaranteed that 'nst' is non-null because it is allocated with >> xmalloc(), and in fact we rely on this three lines later by >> unconditionally dereferencing it. > > The intent of the original code is for attach_stream_filter() to > dete

Re: [PATCH 5/5] streaming: simplify attaching a filter

John Keeping writes: > We are guaranteed that 'nst' is non-null because it is allocated with > xmalloc(), and in fact we rely on this three lines later by > unconditionally dereferencing it. The intent of the original code is for attach_stream_filter() to detect an error condition and return NUL

Re: [PATCH] git-contacts: do not fail parsing of good diffs

lar...@gullik.org (Lars Gullik Bjønnes) writes: > If a line in a patch starts with "--- " it will be deemed > malformed unless it also contains the proper diff header > format. This situation can happen with a valid patch if > it has a line starting with "-- " and that line is removed. > > This pa

Re: [RFC/PATCH] Supporting non-blob notes

On Tue, Feb 18, 2014 at 9:46 PM, Johan Herland wrote: > On Mon, Feb 17, 2014 at 11:48 AM, wrote: >> The recent "git-note -C changes commit type?" thread >> (http://thread.gmane.org/gmane.comp.version-control.git/241950) looks >> like a good occasion to discuss possible uses of non-blob notes. >>

Re: [PATCH] Git release notes man page

Junio C Hamano writes: > Philip Oakley writes: > >> A few days too late for the 1.9.0 release cycle :( >> >> This responds to Stefan Nwe's request for a 'git help' command that would >> access the release notes. ($gmane/240595 17 Jan 2014). >> >> I've used the full name "release-notes" for the h

Re: [PATCH] config: teach "git config --file -" to read from the standard input

Junio C Hamano writes: >> I think I preferred the earlier version where you had "" in the >> name field, and this hunk could just go away. I know you switched it to >> NULL here to avoid making bogus relative filenames in includes. > > Exactly the same comment here. I really like the way how thi

[PATCH 3/4] config: change git_config_with_options() interface

We're going to have more options for config source. Let's alter git_config_with_options() interface to accept struct with all source options. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 75 ++-- cache.h | 8 -- confi

[PATCH 1/4] config: disallow relative include paths from blobs

From: Jeff King When we see a relative config include like: [include] path = foo we make it relative to the containing directory of the file that contains the snippet. This makes no sense for config read from a blob, as it is not on the filesystem. Something like "HEAD:some/path" could hav

[PATCH 2/4] builtin/config.c: rename check_blob_write() -> check_write()

The function will be reused to check for other conditions which prevent write. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 92ebf23f0a9a..a7c55e68883c 100644

[PATCH 4/4] config: teach "git config --file -" to read from the standard input

The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path. Signed-off-by: Kirill A. Shutemov --- builtin/config.c | 11 +++ c

Re: [PATCH] Git release notes man page

From: "Junio C Hamano" Philip Oakley writes: A few days too late for the 1.9.0 release cycle :( This responds to Stefan Nwe's request for a 'git help' command that would access the release notes. ($gmane/240595 17 Jan 2014). I've used the full name "release-notes" for the help guide rathe

Re: git gc --aggressive led to about 40 times slower "git log --raw"

On Wed, Feb 19, 2014 at 3:59 AM, Junio C Hamano wrote: > Let's do something like this first and then later make --depth > configurable just like --width, perhaps? For "aggressive", I think > the default width (hardcoded to 250 but configurable) is a bit too > narrow. > > builtin/gc.c | 2 +- > 1

Re: [PATCH] Provide a 'git help user-manual' route to the docbook

From: "Junio C Hamano" Philip Oakley writes: diff --git a/Documentation/gituser-manual.txt b/Documentation/gituser-manual.txt new file mode 100644 index 000..9fd4744 --- /dev/null +++ b/Documentation/gituser-manual.txt @@ -0,0 +1,34 @@ +gituser-manual(7) += + +NAME +

Re: [PATCH] Git release notes man page

Philip Oakley writes: > A few days too late for the 1.9.0 release cycle :( > > This responds to Stefan Nwe's request for a 'git help' command that would > access the release notes. ($gmane/240595 17 Jan 2014). > > I've used the full name "release-notes" for the help guide rather than > Stefan's o

Re: error: src refspec refs/heads/master matches more than one.

David Kastrup writes: > Junio C Hamano writes: > >> Duy Nguyen writes: >> >>> + if (!force && dwim_ref(name, strlen(name), sha1, &real_ref)) >>> + die(_("creating ref refs/heads/%s makes %s ambiguous.\n" >>> + "Use -f to create it anyway."), >>> + name,

[PATCH] Fix documentation AsciiDoc links for external urls

Turns out that putting 'link:' before the 'http' is actually superfluous in AsciiDoc, as there's already a predefined macro to handle it. "http, https, [etc] URLs are rendered using predefined inline macros." http://www.methods.co.nz/asciidoc/userguide.html#_urls "Hypertext links to files on the

Re: [PATCH] Rename read_replace_refs to check_replace_refs

Michael Haggerty writes: > The semantics of this flag was changed in commit > > ecef23 inline lookup_replace_object() calls > > but wasn't renamed at the time to minimize code churn. Rename it now, > and add a comment explaining its use. > > Signed-off-by: Michael Haggerty > --- > This

Re: [PATCH 1/2] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

Kirill Smelkov writes: >> > 2) alloca(), for small arrays, is used for the same reason - if we change >> > it to xmalloc()/free() the timings get worse >> >> Do you see any use of it outside compat/? >> >> I thought we specifically avoid alloca() for portability. Also we >> do not use variable

[PATCH v2 3/3] revert.c Allow to override cherrypick.recordOrigin

--no-record-origin can be used by scripts to be sure to not record origin information when cherry-picking. --- Documentation/git-cherry-pick.txt | 4 builtin/revert.c | 6 ++ 2 files changed, 10 insertions(+) diff --git a/Documentation/git-cherry-pick.txt b/Documentatio

[PATCH v2 1/3] revert.c: Allow to specify -x via git-config

Without this when maintaining stable branches it's easy to forget to use -x to track where a patch was cherry-picked from. --- Documentation/config.txt | 4 Documentation/git-cherry-pick.txt | 8 builtin/revert.c | 14 +- 3 files changed, 25 in

[PATCH v2 0/3] Allow to configure cherry-pick's record origin

The main motivation is to be able to configure repos that are used for maintaining backports/stable branches and not having to remember to use a special invocation of git cherry-pick. Changes from last version: * add --no-record-origin so scripts can make sure they'll never record a commit id *

[PATCH v2 2/3] revert.c: Add --record-origin

This makes sure we have a command line option that corresponds with the config file option. --- Documentation/git-cherry-pick.txt | 1 + builtin/revert.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-ch

Re: [PATCH] diff: do not reuse_worktree_file for submodules

Thomas Rast writes: > The GIT_EXTERNAL_DIFF calling code attempts to reuse existing worktree > files for the worktree side of diffs, for performance reasons. > However, that code also tries to do the same with submodules. This > results in calls to $GIT_EXTERNAL_DIFF where the old-file is a file

Re: git gc --aggressive led to about 40 times slower "git log --raw"

Jonathan Nieder writes: > David Kastrup wrote: >> Duy Nguyen writes: > >>> Likely because --aggressive passes --depth=250 to pack-objects. Long >>> delta chains could reduce pack size and increase I/O as well as zlib >>> processing signficantly. > [...] >> Compression should reduce rather than i

Re: [PATCH] rev-parse: fix --resolve-git-dir argument handling

John Keeping writes: > There are two problems here: > > 1) If no argument is provided, then the command segfaults > 2) The argument is not consumed, so there will be excess output > > Fix both of these in one go by restructuring the handler for this > option. > > Reported-by: Daniel Hahler > Sig

Question about the relationship between Star Wars and Git

Hi, Are "git push" and "git pull" based on force push and force pull from Star Wars? See: http://starwars.wikia.com/wiki/Telekinesis Also, is the --force option another reference to The Force? The similarity seems striking, especially when you realize that when you google "force push" you get S

Re: [PATCH] Fix documentation AsciiDoc links for external urls

Roberto Tyley writes: > Turns out that putting 'link:' before the 'http' is actually superfluous > in AsciiDoc, as there's already a predefined macro to handle it. > > "http, https, [etc] URLs are rendered using predefined inline macros." > http://www.methods.co.nz/asciidoc/userguide.html#_urls >

Re: [PATCH] Provide a 'git help user-manual' route to the docbook

Philip Oakley writes: > diff --git a/Documentation/gituser-manual.txt > b/Documentation/gituser-manual.txt > new file mode 100644 > index 000..9fd4744 > --- /dev/null > +++ b/Documentation/gituser-manual.txt > @@ -0,0 +1,34 @@ > +gituser-manual(7) > += > + > +NAME > + > +

Re: error: src refspec refs/heads/master matches more than one.

On Tue, Feb 18, 2014 at 11:51:05AM -0800, Junio C Hamano wrote: > John Keeping writes: > > > There's already the arbitrary set of prefixes in > > refs.c::prettify_refname() and refs.c::ref_rev_parse_rules(). I can see > > how a user might think that since "git log refs/heads/name" is > > equival

Re: [PATCH 5/5] implement @{publish} shorthand

Jeff King writes: > In that sense, "publish" is not the best word, either, as it describes > only the first two, but not the third case (and those are just examples; > there may be other setups beyond that, even). > > Perhaps "@{push}" would be the most direct word. Hmph, then the other one woul

Re: error: src refspec refs/heads/master matches more than one.

John Keeping writes: > There's already the arbitrary set of prefixes in > refs.c::prettify_refname() and refs.c::ref_rev_parse_rules(). I can see > how a user might think that since "git log refs/heads/name" is > equivalent to "git log master" then "git branch refs/heads/name" should > be equiva

[PATCH] blame: add a failing test for a CRLF issue.

If a file contains CRLF line endings in a repository with core.autocrlf=input, then blame always marks the lines as "Not Committed Yet", even if they are unmodified. Add a failing test for this case, so we are at least aware of this issue. Reported-by: Ephrim Khong Signed-off-by: brian m. carlso

Re: error: src refspec refs/heads/master matches more than one.

Junio C Hamano writes: > Duy Nguyen writes: > >> +if (!force && dwim_ref(name, strlen(name), sha1, &real_ref)) >> +die(_("creating ref refs/heads/%s makes %s ambiguous.\n" >> + "Use -f to create it anyway."), >> +name, name); > > Does this check s

Re: [PATCH/RESEND] attr: allow pattern escape using backslashes

Nguyễn Thái Ngọc Duy writes: > Patterns in .gitattributes are separated by whitespaces, which makes > it impossible to specify exact spaces in the pattern. '?' can be used > as a workaround, but it matches other characters too. This patch makes > a space following a backslash part of the pattern

Re: error: src refspec refs/heads/master matches more than one.

On Tue, Feb 18, 2014 at 11:03:10AM -0800, Junio C Hamano wrote: > Duy Nguyen writes: > > > Prevent is a strong word. I meant we only do it if they force > > it. Something like this.. > > > > -- 8< -- > > diff --git a/branch.c b/branch.c > > index 723a36b..3f0540f 100644 > > --- a/branch.c > > +++

Re: [PATCH 0/4] Good bye fnmatch

Nguyễn Thái Ngọc Duy writes: > Long story short, we wanted globbing wildcard "**" so I ripped > wildmatch library from rsync to do it. And it opened a possibility > to replace fnmatch completely, which would provide consistent behavior > across platforms (native fnmatch behaves differently on ma

Re: [PATCH] revert.c: Allow to specify -x via git-config

brian m. carlson wrote: > I can provide a use case. At work, we merge into the maintenance and > development branches and cherry-pick from the maintenance to the stable > branches. We want committers to always use -x -s because we need to > know which reviewer backported the change and we want t

Re: [PATCH] config: teach "git config --file -" to read from the standard input

Jeff King writes: >> +} else { >> +if (cf->name) >> +return error("bad config file line %d in %s", >> +cf->linenr, cf->name); >> +else >> +return error("bad config file line %d", cf->linenr); >

Re: diff weirdness (bug?)

Dario Bertini writes: > On 02/14/2014 09:03 PM, Junio C Hamano wrote: >> This is a combined diff, and yaml-related lines are added relative >> to your _other_ branch you are merging (notice these + are indented >> by one place). Relative to what you had at the tip of your branch >> before you st

Re: error: src refspec refs/heads/master matches more than one.

Duy Nguyen writes: > Prevent is a strong word. I meant we only do it if they force > it. Something like this.. > > -- 8< -- > diff --git a/branch.c b/branch.c > index 723a36b..3f0540f 100644 > --- a/branch.c > +++ b/branch.c > @@ -251,6 +251,11 @@ void create_branch(const char *head, >

Re: [PATCH] revert.c: Allow to specify -x via git-config

On Tue, Feb 18, 2014 at 09:49:13AM -0800, Jonathan Nieder wrote: > Can you say more about the context? Why is it important to record the > original commit id? Is it a matter of keeping a reminder of the > commits' similarity (which cherry-pick without '-x' does ok by reusing > the same message) o

Re: Make the git codebase thread-safe

It shouldn't be hard for us to run some tests with this patch applied. Will report back in a day or two. On Tue, Feb 18, 2014 at 9:55 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Sat, Feb 15, 2014 at 8:15 AM, Zachary Turner wrote: >> ... >>> 2) Use TLS as you suggest and have one fd

Re: Make the git codebase thread-safe

Duy Nguyen writes: > On Sat, Feb 15, 2014 at 8:15 AM, Zachary Turner wrote: > ... >> 2) Use TLS as you suggest and have one fd per pack thread. Probably >> the most complicated code change (at least for me, being a first-time >> contributor) > > It's not so complicated. I suggested a patch [1]

Re: [PATCH v2 3/3] push: Add the --no-recurse-submodules option

I noticed the option in the man-page but there is still no configuration option available. Did you forget to add it after all? Right now --recurse-submodules has little use by itself as the problem it solves is forgetting to push a submodule which is no different from forgetting to specify the o

Re: [PATCH] revert.c: Allow to specify -x via git-config

Hi, Guido Günther wrote: > Without this when maintaining stable branches it's easy to forget to use > -x to track where a patch was cherry-picked from. [...] > --- a/Documentation/git-cherry-pick.txt > +++ b/Documentation/git-cherry-pick.txt > @@ -215,6 +215,14 @@ the working tree. > spending ex

Business Proposal

I am Mr. Mr. Leung Wing Lok and I work with Hang Seng Bank, Hong Kong. I have a Business Proposal of $19,500,000.00 of mutual benefits. Contact me via leungwlok...@yahoo.com.vn for more info.-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vg

Re: git gc --aggressive led to about 40 times slower "git log --raw"

2014-02-18 9:45 GMT+00:00 Duy Nguyen : > Christian can try "git repack -adf" That's what I already mentioned in my first mail is what I used to fix the problem. Here are some 'hard' numbers, FWIW: - both ~/scr and swap are on the same SSD; $ free total used free sha

Re: git gc --aggressive led to about 40 times slower "git log --raw"

David Kastrup wrote: > Duy Nguyen writes: >> Likely because --aggressive passes --depth=250 to pack-objects. Long >> delta chains could reduce pack size and increase I/O as well as zlib >> processing signficantly. [...] > Compression should reduce rather than increase the total amount of > reads.

Re: gitweb.cgi bug - XML Parsing Error: not well-formed

What's your mean ? I think I had post enough information: When I access https://xxx.info/repo/git?p=DRE/Reference.git;a=commitdiff;h=fbd4e74c867214062ad39282a899f1d14a2e89ba Then gitweb.cgi generate invalid XHTML: diff --git a/RFC/2010/DRE-2010-004 RFC for Update Synchronization Program & So

Re: [RFC/PATCH] Supporting non-blob notes

On Mon, Feb 17, 2014 at 11:48 AM, wrote: > The recent "git-note -C changes commit type?" thread > (http://thread.gmane.org/gmane.comp.version-control.git/241950) looks > like a good occasion to discuss possible uses of non-blob notes. > > The use-case we're thinking about is the storage of testru

Re: gitweb.cgi bug - XML Parsing Error: not well-formed

On Feb 18, 2014, at 6:41 AM, Dongsheng Song wrote: > Here is gitweb generated XHTML fragment: > > … You're going to have to be more specific. - Andrew -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info a

[PATCH v3 21/25] checkout: support checking out into a new working directory

"git checkout --to" sets up a new working directory with a .git file pointing to $GIT_DIR/repos/. It then executes "git checkout" again on the new worktree with the same arguments except "--to" is taken out. The second checkout execution, which is not contaminated with any info from the current rep

[PATCH v3 17/25] setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()

Signed-off-by: Nguyễn Thái Ngọc Duy --- setup.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.c b/setup.c index 282fdc9..e56ec11 100644 --- a/setup.c +++ b/setup.c @@ -285,6 +285,10 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)

[PATCH v3 09/25] commit: use SEQ_DIR instead of hardcoding "sequencer"

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index 3767478..ee3ac10 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -155,7 +155,7 @@ static void determine_whence(struct wt_s

[PATCH v3 23/25] checkout: detach if the branch is already checked out elsewhere

The normal rule is anything outside refs/heads/ is detached. This strictens the rule a bit more: if the branch is checked out (either in $GIT_COMMON_DIR/HEAD or any $GIT_DIR/repos/.../HEAD) then it's detached as well. A hint is given so the user knows where to go and do something there if they sti

[PATCH v3 11/25] git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

If $GIT_COMMON_DIR is set, $GIT_OBJECT_DIRECTORY should be $GIT_COMMON_DIR/objects, not $GIT_DIR/objects. Just let rev-parse --git-path handle it. Signed-off-by: Nguyễn Thái Ngọc Duy --- git-sh-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-sh-setup.sh b/git-sh-

[PATCH v3 06/25] *.sh: respect $GIT_INDEX_FILE

Signed-off-by: Nguyễn Thái Ngọc Duy --- git-pull.sh | 2 +- git-stash.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 0a5aa2c..c9dc9ba 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -218,7 +218,7 @@ test true = "$rebase" && { if !

[PATCH v3 15/25] setup.c: detect $GIT_COMMON_DIR in is_git_directory()

If the file "$GIT_DIR/commondir" exists, it contains the value of $GIT_COMMON_DIR. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/gitrepository-layout.txt | 4 setup.c| 38 -- strbuf.c | 8

[PATCH v3 10/25] Add new environment variable $GIT_COMMON_DIR

This variable is intended to support multiple working directories attached to a repository. Such a repository may have a main working directory, created by either "git init" or "git clone" and one or more linked working directories. These working directories and the main repository share the same r

[PATCH v3 22/25] checkout: clean up half-prepared directories in --to mode

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 49 +++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 2b856a6..f961604 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c

[PATCH v3 12/25] *.sh: avoid hardcoding $GIT_DIR/hooks/...

If $GIT_COMMON_DIR is set, it should be $GIT_COMMON_DIR/hooks/, not $GIT_DIR/hooks/. Just let rev-parse --git-path handle it. Signed-off-by: Nguyễn Thái Ngọc Duy --- git-am.sh | 22 +++--- git-rebase--interactive.sh | 6 +++--- git-rebase

[PATCH v3 19/25] wrapper.c: wrapper to open a file, fprintf then close

Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h | 2 ++ wrapper.c | 31 +++ 2 files changed, 33 insertions(+) diff --git a/cache.h b/cache.h index 98b5dd3..99b86d9 100644 --- a/cache.h +++ b/cache.h @@ -1239,6 +1239,8 @@ static inline ssize_t write_str_in_full(int

[PATCH v3 24/25] prune: strategies for linked checkouts

alias REPO=$GIT_COMMON_DIR/repos/ - linked checkouts are supposed to update mtime of $REPO/gitdir - linked checkouts are supposed to keep its location in $REPO/gitdir up to date - "git checkout --to" is supposed to create $REPO/locked if the new repo is on a different partition than the

[PATCH v3 13/25] git-stash: avoid hardcoding $GIT_DIR/logs/....

Signed-off-by: Nguyễn Thái Ngọc Duy --- git-stash.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index ae7d16e..12d9b37 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -183,7 +183,7 @@ store_stash () { fi # Make sure the re

[PATCH v3 16/25] setup.c: convert check_repository_format_gently to use strbuf

Signed-off-by: Nguyễn Thái Ngọc Duy --- setup.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.c b/setup.c index 4e5711c..282fdc9 100644 --- a/setup.c +++ b/setup.c @@ -281,7 +281,9 @@ void setup_work_tree(void) static int check_repository_format_gently(

[PATCH v3 14/25] setup.c: convert is_git_directory() to use strbuf

Signed-off-by: Nguyễn Thái Ngọc Duy --- setup.c | 35 +++ strbuf.h | 4 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/setup.c b/setup.c index 6c3f85f..999225b 100644 --- a/setup.c +++ b/setup.c @@ -184,31 +184,34 @@ void verify_non_filenam

[PATCH v3 25/25] gc: support prune --repos

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/config.txt | 6 ++ builtin/gc.c | 17 + 2 files changed, 23 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index cbf4d97..eec2d05 100644 --- a/Documentation/config.txt +++ b/Doc

[PATCH v3 18/25] setup.c: support multi-checkout repo setup

The repo setup procedure is updated to detect $GIT_DIR/commondir and set $GIT_COMMON_DIR properly. The core.worktree is ignored when $GIT_DIR/commondir presents. This is because "commondir" repos are intended for separate/linked checkouts and pointing them back to a fixed core.worktree just does n

[PATCH v3 08/25] fast-import: use git_path() for accessing .git dir instead of get_git_dir()

This allows git_path() to redirect info/fast-import to another place if needed Signed-off-by: Nguyễn Thái Ngọc Duy --- fast-import.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fast-import.c b/fast-import.c index 4fd18a3..08a1e78 100644 --- a/fast-import.c +++ b/fast-

[PATCH v3 20/25] use new wrapper write_file() for simple file writing

This fixes common problems in these code about error handling, forgetting to close the file handle after fprintf() fails, or not printing out the error string.. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/branch.c | 4 +--- builtin/init-db.c | 7 +-- daemon.c | 11 +--

[PATCH v3 05/25] Make git_path() aware of file relocation in $GIT_DIR

We allow the user to relocate certain paths out of $GIT_DIR via environment variables, e.g. GIT_OBJECT_DIRECTORY, GIT_INDEX_FILE and GIT_GRAFT_FILE. All callers are not supposed to use git_path() or git_pathdup() to get those paths. Instead they must use get_object_directory(), get_index_file() and

[PATCH v3 00/25] Support multiple checkouts

In short you can attach multiple worktrees to the same git repository with "git checkout --to ". This is basically what git-new-workdir is for. Previous discussion here http://thread.gmane.org/gmane.comp.version-control.git/239194/focus=239581 Compared to last time: - .git file format remains un

[PATCH v3 02/25] Convert git_snpath() to strbuf_git_path()

In the previous patch, git_snpath() is modified to take a strbuf buffer from get_pathname() because vsnpath() needs that. But that makes it awkward because git_snpath() receives a pre-allocated buffer from outside and has to copy data back. Rename it to strbuf_git_path() and make it receive strbuf

[PATCH v3 01/25] path.c: make get_pathname() return strbuf instead of static buffer

We've been avoiding PATH_MAX whenever possible. This patch makes get_pathname() return a strbuf and updates the callers to take advantage of this. The code is simplified as we no longer need to worry about buffer overflow. Signed-off-by: Nguyễn Thái Ngọc Duy --- path.c | 119

[PATCH v3 03/25] path.c: rename vsnpath() to do_git_path()

The name vsnpath() gives an impression that this is general path handling function. It's not. This is the underlying implementation of git_path(), git_pathdup() and strbuf_git_path() which will prefix $GIT_DIR in the result string. Signed-off-by: Nguyễn Thái Ngọc Duy --- path.c | 8 1 f

[PATCH v3 07/25] reflog: avoid constructing .lock path with git_path

git_path() soon understands the path given to it. Some paths "abc" may become "def" while other "ghi" may become "ijk". We don't want git_path() to interfere with .lock path construction. Concatenate ".lock" after the path has been resolved by git_path() so if "abc" becomes "def", we'll have "def.l

[PATCH v3 04/25] path.c: group git_path(), git_pathdup() and strbuf_git_path() together

Signed-off-by: Nguyễn Thái Ngọc Duy --- path.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/path.c b/path.c index 635ec41..e088c40 100644 --- a/path.c +++ b/path.c @@ -78,6 +78,16 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)

Re: [PATCH 5/5] implement @{publish} shorthand

On Tue, Feb 18, 2014 at 9:52 AM, Jeff King wrote: > On Sat, Feb 15, 2014 at 11:50:10AM -, Philip Oakley wrote: >> >>> This patch introduces the @{publish} shorthand (or >> >>> "@{pu}" to be even shorter). >> >> Just to say that I'm not sure that "publish" is the best word for >> this concept.

Fwd: git p4: feature request - branch check filtering

Hi, I'm unable to find a similar issue, and if it's raised on the mailing list I apologize. I work at a company that has recently moved all CVS, SVN, and git repositories to Perforce. Depots have not been setup correctly in every case, and there is one depot that contains literally hundreds of p

gitweb.cgi bug - XML Parsing Error: not well-formed

Here is gitweb generated XHTML fragment: diff --git a/RFC/2010/DRE-2010-004 RFC for Update Synchronization Program & Solve the Balance Adjustment Issue v2.doc b/RFC/2010/DRE-2010-004 RFC for Update Synchronization Program & Solve the Balance Adjustment Issue v2.doc new file mode 100644 (file) in

[PATCH] Rename read_replace_refs to check_replace_refs

The semantics of this flag was changed in commit ecef23 inline lookup_replace_object() calls but wasn't renamed at the time to minimize code churn. Rename it now, and add a comment explaining its use. Signed-off-by: Michael Haggerty --- This change doesn't conflict with anything in pu;

http: never use curl_easy_perform

On Tue, Feb 18, 2014 at 10:09:29AM +0100, Daniel Stenberg wrote: > Okey, I checked this closer now and this is the full explanation to > what happens. It seems to work as intended: Thanks, your explanation makes perfect sense. I think we should apply the patch below for git to consistently use t

Problems while converting complex repository from SVN

Hi, I had some issues while converting our current SVN repository to a GIT repository. The old repository has a lot of strange history in it making it far from easy to convert it but for some issues I had to modify the convert scripts. As I don't know the internals of GIT or git-svn enough I

Re: git gc --aggressive led to about 40 times slower "git log --raw"

Duy Nguyen writes: > On Tue, Feb 18, 2014 at 3:55 PM, David Kastrup wrote: > >> I've seen the same with my ongoing work on git-blame with the current >> Emacs Git mirror. Aggressive packing reduces the repository size to >> about a quarter, but it blows up the system time (mainly I/O) >> signif

Re: git gc --aggressive led to about 40 times slower "git log --raw"

On Tue, Feb 18, 2014 at 3:55 PM, David Kastrup wrote: > Christian Jaeger writes: > >> I've got a repository where "git log --raw > _somefile" took a few >> seconds in the past, but after an attempt at merging some commits that >> were collected in a clone of the same repo that was created about a

Re: [PATCH 1/5] notes-utils: handle boolean notes.rewritemode correctly

Jeff King writes: > On Tue, Feb 18, 2014 at 09:41:51AM +0100, David Kastrup wrote: > >> gcc's flow analysis works with the same data as humans reading the >> code. If there is no information content in the function call, it makes >> more sense to either making it void. > > The point of error() r

Re: git gc --aggressive led to about 40 times slower "git log --raw"

Christian Jaeger writes: > I've got a repository where "git log --raw > _somefile" took a few > seconds in the past, but after an attempt at merging some commits that > were collected in a clone of the same repo that was created about a > year ago, I noticed that this command was now taking 3 min

Re: [msysGit] Git for Windows 1.9.0 (fwd)

On Tue, Feb 18, 2014 at 10:04:54AM +0100, Erik Faye-Lund wrote: > It's right here: https://github.com/msysgit/msysgit/pull/159 > > You probably looked in our git repo rather than our msysGit repo. Oh indeed I was, thanks. Mike -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [PATCH] revert.c: Allow to specify -x via git-config

On Tue, Feb 18, 2014 at 07:56:20AM +0100, Guido Günther wrote: > Without this when maintaining stable branches it's easy to forget to use > -x to track where a patch was cherry-picked from. > > Signed-off-by: Guido Günther > --- > Documentation/git-cherry-pick.txt | 8 > builtin/revert

Re: [BUG?] git http connection reuse

On Tue, 18 Feb 2014, Jeff King wrote: I'm not clear whether you mean by this that it is _expected_ in my test program for curl not to reuse the connection. Or that curl may simply have to do a little more work, and it is still a bug that the connection is not reused. Okey, I checked this clo

Re: [msysGit] Git for Windows 1.9.0

Am 18.02.2014 00:38, schrieb Johannes Schindelin: > Dear Git fanbois, > > this announcement informs you that the small team of volunteers who keep > the Git ship afloat for the most prevalent desktop operating system > managed to release yet another version of Git for Windows: > > Git Release Not

Re: [msysGit] Git for Windows 1.9.0 (fwd)

On Tue, Feb 18, 2014 at 3:33 AM, Mike Hommey wrote: > On Tue, Feb 18, 2014 at 12:52:28AM +0100, Johannes Schindelin wrote: >> Hopefully the Postfix Greylisting Policy Server will not try again to >> greylist me, as it might however do without violating the RFC. >> >> -- Forwarded message -

Re: [PATCH 1/5] notes-utils: handle boolean notes.rewritemode correctly

On Tue, Feb 18, 2014 at 09:41:51AM +0100, David Kastrup wrote: > gcc's flow analysis works with the same data as humans reading the > code. If there is no information content in the function call, it makes > more sense to either making it void. The point of error() returning a constant -1 is to

Re: [PATCH 5/5] implement @{publish} shorthand

On Sat, Feb 15, 2014 at 11:50:10AM -, Philip Oakley wrote: > >>> This patch introduces the @{publish} shorthand (or > >>> "@{pu}" to be even shorter). > > Just to say that I'm not sure that "publish" is the best word for > this concept. > > To my mind something is published when some form of

  1   2   >