Re: [PATCH 0/3] Using a bit more decoration

On Mon, Apr 08, 2013 at 09:54:50PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > The tricky part is how to store the index for each commit (or object). I > > don't see a way around adding a new field to "struct commit" to do so. > > We could reuse the space "indegree" used to live at;

Re: commit-message attack for extracting sensitive data from rewritten Git history

Am 4/8/2013 23:54, schrieb Jeff King: > Yeah, it would make sense for filter-branch to have a "--map-commit-ids" > option or similar that does the update. At first I thought it might take > two passes, but I don't think it is necessary, as long as we traverse > the commits topologically (i.e., you

git-http-backend: anonymous read, authenticated write

I've been trying to set up git-http-backend+lighttpd. I've managed to set up anonymous read-only access, and I then successfully configured authentication for both read and write. Then I get stuck. The man-page for git-http-backend says that the following snippet can be used for Apache 2.x:

Re: [PATCH 0/3] Using a bit more decoration

Jeff King writes: > The tricky part is how to store the index for each commit (or object). I > don't see a way around adding a new field to "struct commit" to do so. We could reuse the space "indegree" used to live at; that is a one-word space already, and I really do not need "encoding". It wa

Re: [PATCH 0/3] Using a bit more decoration

On Mon, Apr 08, 2013 at 09:17:42PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > [1] The thing that made me think about this was making a version of > > paint_down_to_common that could keep a separate color for each > > source, rather than only PARENT1 and PARENT2. That would le

Re: [PATCH 0/3] Using a bit more decoration

Jeff King writes: > Neat. Reading through, I didn't notice anything obviously wrong with any > of the patches (though there is one gcc warning, which I'll respond to > separately). > > It does make me a little nervous to have code that almost never gets > exercised (i.e., when indegree is really

Re: [PATCH 0/3] Using a bit more decoration

Jeff King writes: > [1] The thing that made me think about this was making a version of > paint_down_to_common that could keep a separate color for each > source, rather than only PARENT1 and PARENT2. That would let us do > the "--contains" traversal in a breadth-first way, but calcul

Re: [PATCH 1/3] commit: shrink "indegree" field

On Mon, Apr 08, 2013 at 04:01:52PM -0700, Junio C Hamano wrote: > +static inline intptr_t get_indegree(struct decoration *indegree, > + struct commit *commit) > +{ > + if (commit->indegree < QUICK_INDEGREE_LIMIT) > + return commit->indegree; > +

Re: [PATCH 0/3] Using a bit more decoration

On Mon, Apr 08, 2013 at 04:01:51PM -0700, Junio C Hamano wrote: > This comes on top of the two "decorate" patches that introduced the > clear_decoration() function. > [...] > Junio C Hamano (3): > commit: shrink "indegree" field > commit: rename parse_commit_date() > commit: add get_commit_e

Re: [PATCH 2/2] clone: Allow repo using gitfile as a reference

Aaron Schrab wrote: > --- a/builtin/clone.c > +++ b/builtin/clone.c > @@ -232,11 +232,19 @@ static void strip_trailing_slashes(char *dir) > static int add_one_reference(struct string_list_item *item, void *cb_data) > { > char *ref_git; > + const char *repo; > struct strbuf altern

Re: [PATCH 1/2] clone: Fix error message for reference repository

Aaron Schrab wrote: > Do not report that an argument to clone's --reference option is not a > local directory. Nothing checks for the existence or type of the path > as supplied by the user; checks are only done for particular contents of > the supposed directory, so we have no way to know the st

[PATCH 2/3] commit: rename parse_commit_date()

This function does a lot more than parsing the committer date out of a commit object buffer. After its sole caller parses one "tree", and 0 or more "parent", it makes sure the next one is "author" (and skips it), makes sure "committer" follows (and skips the committer identity), and parses the dat

[PATCH 3/3] commit: add get_commit_encoding()

This replaces two duplicated and slightly different helper functions in pretty.c and sequencer.c that parses the commit object to find the encoding header, by having the header parsed when other standard commit header fields are parsed. A commit object now has a small integer that is used to index

[PATCH 1/3] commit: shrink "indegree" field

The "indegree" field in the commit object is used only while a commit list is sorted using the topo_order sorting. The idea is to initially store the number of direct parents and the commit itself there, and start emitting the commits with indegree 1 (i.e. leaves that do not have any commit as the

[PATCH 0/3] Using a bit more decoration

This comes on top of the two "decorate" patches that introduced the clear_decoration() function. I am not sure if pre-parsing and sharing the encoding values in-core would affect performance very much, but now we have 2 bytes (or 6 bytes, if you are on 64-bit archs) free to use in "struct commit"

[PATCH 2/2] clone: Allow repo using gitfile as a reference

Try reading gitfile files when processing --reference options to clone. This will allow, among other things, using a submodule checked out with a recent version of git as a reference repository without requiring the user to have internal knowledge of submodule layout. Signed-off-by: Aaron Schrab

[PATCH 1/2] clone: Fix error message for reference repository

Do not report that an argument to clone's --reference option is not a local directory. Nothing checks for the existence or type of the path as supplied by the user; checks are only done for particular contents of the supposed directory, so we have no way to know the status of the supplied path. T

[PATCH v2 0/2] Using gitfile repository with clone --reference

Here's the promised second version of this series. The diff in the first patch is unchanged, but I have made significant changes to the commit message to hopefully to a better job of describing why I think the old error message is bad. For the second patch I've eliminated the need to do a cast.

Re: RFC: two minor tweaks to check-ignore to help git-annex assistant

On Mon, Apr 08, 2013 at 07:13:11PM +0100, Adam Spiers wrote: > I was recently informed by the author of git-annex that my > implementation of git check-ignore has two minor deficiencies which > currently prevent him from adding .gitignore support to the git-annex > assistant (web UI): > > 1.

Re: [PATCH] t3700 (add): add failing test for add with submodules

On Mon, Apr 08, 2013 at 03:03:41PM -0700, Junio C Hamano wrote: > >> +test_expect_failure 'git add should not go past submodule boundaries' ' > >> + mkdir submodule_dir && > >> + ( > >> + cd submodule_dir && > >> + git init && > >> + cat >foo <<-\EOF && > >> +

Re: tar on Mac does not like empty tar from git archive

On Apr 8, 2013, at 17:05 , Jeff King wrote: > That makes me think the latter ("we are wrong"). I don't have my OS X > box handy; can you provide a sample empty tarfile that it creates? I created mac.tar on my Mac and linux.tar on a RHEL6.3 machine (tar (GNU tar) 1.23). Both were created with

Re: [PATCH] t3700 (add): add failing test for add with submodules

Jeff King writes: > On Mon, Apr 08, 2013 at 03:56:49PM +0530, Ramkumar Ramachandra wrote: > >> git add currently goes past submodule boundaries. Document this bug. > > It's not just submodules, but we should not recurse into any > sub-repository. If I have an unrelated Meta/ repository, I should

Re: [RFC/PATCH 0/7] Rework git core for native submodules

Junio C Hamano wrote: > If all of your argument starts from "I think .gitmodules is ugly > because it is not an object of a separate type stored at the path of > the submodule, and here are the reasons why I think it is ugly", I > have nothing more to say to you. _This_ is how you summarize the se

Re: [PATCH 1/4] gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch

j...@blackdown.de (Jürgen Kreileder) writes: > Fixes the encoding for several _plain actions and for text/* and */*+xml > blobs. > > Signed-off-by: Jürgen Kreileder > --- Thanks, will queue but not hold until I hear something from Jakub. > gitweb/gitweb.perl |8 +++- > 1 file changed

Re: RFC: two minor tweaks to check-ignore to help git-annex assistant

Adam Spiers writes: > I already have a rough fix for the second issue, but I wanted to > solicit feedback on the appropriate UI changes before proceeding much > further. Does something like the below patch seem reasonable, modulo > the lack of tests? In case the UI changes I am proposing are no

Re: [PATCH 1/2] progress: create public humanize() to show sizes

On Mon, Apr 8, 2013 at 2:18 PM, Antoine Pelisse wrote: > Currently, humanization of downloaded size is done in the same function > as text formatting. This is an issue if anyone else wants to use this. > > Separate text formatting from size simplification and make the function > public so that it

Re: commit-message attack for extracting sensitive data from rewritten Git history

On Mon, Apr 08, 2013 at 08:40:36AM -0700, Junio C Hamano wrote: > With or without the security issue, leaving old object names that > will become irrelevant in the rewritten history will make the > resulting history less useful, simply because people cannot look at > the objects these messages ref

Re: [PATCH] http-backend: respect GIT_NAMESPACE with dumb clients

On Mon, Apr 08, 2013 at 11:25:39PM +0200, Thomas Rast wrote: > At the risk of repeating something that's been said already -- I only > skimmed the thread -- this test breaks in today's pu on my machine. I > get: > [...] > --- expect2013-04-08 21:24:36.571874540 + > +++ actual2013-04-0

Re: [PATCH 1/2] progress: create public humanize() to show sizes

Antoine Pelisse writes: > Currently, humanization of downloaded size is done in the same function > as text formatting. This is an issue if anyone else wants to use this. > > Separate text formatting from size simplification and make the function > public so that it can easily be used by other cl

Re: [RFC/PATCH 0/7] Rework git core for native submodules

On Mon, Apr 08, 2013 at 10:41:57PM +0200, Jens Lehmann wrote: > (While it is easier to merge the link object, a .gitmodules > aware merge driver would work just as well) I have not been following this thread that closely, so apologies if I missed it, but one thing I have not seen mention of is ho

Re: [PATCH] t3700 (add): add failing test for add with submodules

On Mon, Apr 08, 2013 at 03:56:49PM +0530, Ramkumar Ramachandra wrote: > git add currently goes past submodule boundaries. Document this bug. It's not just submodules, but we should not recurse into any sub-repository. If I have an unrelated Meta/ repository, I should not be able to "git add Meta

Re: [PATCH] http-backend: respect GIT_NAMESPACE with dumb clients

John Koleszar writes: > Filter the list of refs returned via the dumb HTTP protocol according > to the active namespace, consistent with other clients of the > upload-pack service. > > Signed-off-by: John Koleszar At the risk of repeating something that's been said already -- I only skimmed the

Re: [PATCH 2/2] decorate: add "clear_decoration()"

Jeff King writes: > On Sun, Apr 07, 2013 at 11:14:17PM -0700, Junio C Hamano wrote: > >> So far, all the users of the decoration API used decoration that >> only grows and discarded at the end of the program execution. >> >> Introduce for_each_decoration() that lets the caller iterate over >> al

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

Jeff King writes: > On Mon, Apr 08, 2013 at 02:08:03PM -0700, Junio C Hamano wrote: > >> OK, so you are envisioning that transport-helper would read from the >> helper after importer is done? If so, perhaps it is a prudent >> solution to disconnect in this version (to fix), and then in a >> sepa

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

On Mon, Apr 08, 2013 at 02:08:03PM -0700, Junio C Hamano wrote: > OK, so you are envisioning that transport-helper would read from the > helper after importer is done? If so, perhaps it is a prudent > solution to disconnect in this version (to fix), and then in a > separate patch that adds such a

Re: [PATCH 2/2] decorate: add "clear_decoration()"

On Sun, Apr 07, 2013 at 11:14:17PM -0700, Junio C Hamano wrote: > So far, all the users of the decoration API used decoration that > only grows and discarded at the end of the program execution. > > Introduce for_each_decoration() that lets the caller iterate over > all defined decorations and us

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

Felipe Contreras writes: > On Mon, Apr 8, 2013 at 1:46 PM, Junio C Hamano wrote: > ... But if we keep helper running, who will be communicating with it via these open pipes? The process that is calling finish_command() on fast-import and disconnecting from the helper won't

Re: tar on Mac does not like empty tar from git archive

On Mon, Apr 08, 2013 at 02:36:05PM -0400, BJ Hargrave wrote: > Git 1.8.2.1 includes commit bd54cf17 - archive: handle commits with an > empty tree > > Test 2 of t5004-archive-corner-cases, "tar archive of empty tree is > empty", fails on Mac OS X 10.8.3 (with XCode 4.6.1) since the tar > command

Re: [RFC/PATCH 0/7] Rework git core for native submodules

This is going nowhere. You're stuck at making the current submodule system work, not answering my questions, diverting conversation, repeatedly asking the same stupid questions, labelling everything that I say "subjective", and refusing to look at the objective counterpart (aka, the code). It's c

Re: [PATCH] checkout: abbreviate hash in suggest_reattach

On Mon, Apr 08, 2013 at 06:53:42PM +0300, Kevin Bracey wrote: > After printing the list of left-behind commits (with abbreviated > hashes), use an abbreviated hash in the suggested 'git branch' command; > there's no point in outputting a full 40-character hex string in some > friendly advice. > >

Re: [RFC/PATCH 0/7] Rework git core for native submodules

Ok, here comes an updated version of our comparison list which I updated with what I read in recent discussions. As I said earlier, please speak up if I missed anything (or forgot to add anyone to the CC). I picked up one advantage ("no need to cd-to-toplevel to edit .gitmodules) two new disadvant

Re: [RFC/PATCH 0/7] Rework git core for native submodules

Ramkumar Ramachandra writes: > Junio C Hamano wrote: >> Ramkumar Ramachandra writes: >> >>> Does git diff/ commit/ add/ rm or any other command you can think of >>> rely on a special file in the worktree (aka .gitmodules) to be checked >>> out? >> >> Try "git add foo~" with usual suspect in .git

[PATCH 4/4] gitweb: Fix broken blob action parameters on blob/commitdiff pages

Fix broken blob action parameters on blobdiff and commitdiff pages by explicitly passing variables instead of relying on global ones. (The broken parameters on blob links lead to blob pages which show the blob but with a hash instead of a commit message and have broken blob_plain (404 - Cannot fin

[PATCH 2/4] gitweb: Make feed title valid utf8

Properly encode site and project names for RSS and Atom feeds. Signed-off-by: Jürgen Kreileder --- gitweb/gitweb.perl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 9cfe5b5..09294eb 100755 --- a/gitweb/gitweb.perl +++ b/gitweb

[PATCH 1/4] gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch

Fixes the encoding for several _plain actions and for text/* and */*+xml blobs. Signed-off-by: Jürgen Kreileder --- gitweb/gitweb.perl |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 1309196..9cfe5b5 100755 --- a/gitweb

Re: [ANNOUNCE] Git v1.8.1.6

Junio C Hamano writes: > A maintenance release Git v1.8.1.6 is now available at the > usual places. > > The release tarballs are found at: > > http://code.google.com/p/git-core/downloads/list The description on the download page

Re: [RFC/PATCH 0/7] Rework git core for native submodules

Junio C Hamano wrote: > Ramkumar Ramachandra writes: > >> Does git diff/ commit/ add/ rm or any other command you can think of >> rely on a special file in the worktree (aka .gitmodules) to be checked >> out? > > Try "git add foo~" with usual suspect in .gitignore ;-) First, it's not a hard requi

Re: --simplify-merges breakage

Kevin Bracey writes: > Commit 4b7f53d ("simplify-merges: drop merge from irrelevant side > branch") appears to have broken simplify-merges. > > ... now I see the "report problems > immediately" message on the recent merge of that change. I hope more people now see why we would like to see more p

Re: [RFC/PATCH 0/7] Rework git core for native submodules

Ramkumar Ramachandra writes: > Does git diff/ commit/ add/ rm or any other command you can think of > rely on a special file in the worktree (aka .gitmodules) to be checked > out? Try "git add foo~" with usual suspect in .gitignore ;-) -- To unsubscribe from this list: send the line "unsubscribe

Re: [PATCH v2 6/7] remote-bzr: add utf-8 support for fetching

On 08.04.13 19:27, Felipe Contreras wrote: > From: Christophe Simonis > > Initial patch by Timotheus Pokorra. > > [fc: added tests] > > Signed-off-by: Felipe Contreras > --- > contrib/remote-helpers/git-remote-bzr | 15 +-- > contrib/remote-helpers/test-bzr.sh| 32

Re: [PATCH v4] transport-helper: report errors properly

On Mon, Apr 08, 2013 at 11:20:15AM -0700, Sverre Rabbelier wrote: > On Mon, Apr 8, 2013 at 7:40 AM, Felipe Contreras > wrote: > > + die("Reading from remote helper failed"); > > Does the user know what a remote helper is? Could we point them at > some helpful docs in case they don'

Re: [PATCH v4] transport-helper: report errors properly

On Mon, Apr 08, 2013 at 09:40:04AM -0500, Felipe Contreras wrote: > If a push fails because the remote-helper died (with fast-export), the > user won't see any error message. So let's add one. > > At the same time lets add tests to ensure this error is reported, and > while we are at it, check th

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

On Mon, Apr 08, 2013 at 09:38:28AM -0500, Felipe Contreras wrote: > > Nowhere does it say that we should not check fast-import's exit value, > > and indeed, the patch does not replace that check at all. It comes > > immediately after. It replaces the WNOHANG check of the helper's exit > > code (i.

Re: [PATCH 1/2] clone: Fix error message for reference repository

Aaron Schrab writes: >>You may be dealing with an old-style submodule checkout. > > No, the submodule in question was done with the new style. I know that and I wasn't talking about _your_ particular case. I just wanted to make sure people who are reading this thread from sidelines (or finding

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

On Mon, Apr 8, 2013 at 1:46 PM, Junio C Hamano wrote: >>> ... But if we keep >>> helper running, who will be communicating with it via these open >>> pipes? The process that is calling finish_command() on fast-import >>> and disconnecting from the helper won't be, as read/write to the >>> pipe,

--simplify-merges breakage

Commit 4b7f53d ("simplify-merges: drop merge from irrelevant side branch") appears to have broken simplify-merges. [Credit to "git bisect run" - and now I see the "report problems immediately" message on the recent merge of that change.] I was trying to get my head around history simplificati

Re: [RFC/PATCH 0/7] Rework git core for native submodules

Junio C Hamano wrote: > Ramkumar Ramachandra writes: > >> 1. Having a toplevel .gitmodules means that any git-core command like >> add/ rm/ mv will be burdened with looking for the .gitmodules at the >> toplevel of the worktree and editing it appropriately along with >> whatever it was built to do

Re: [PATCH v2 0/7] remote-bzr: generic updates

Felipe Contreras writes: > On Mon, Apr 8, 2013 at 1:26 PM, Junio C Hamano wrote: >> Oops. The previous round is already now part of 'master'. > > All right, rebased and resent. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.

Re: [PATCH 2/2] clone: Allow repo using gitfile as a reference

At 11:00 -0700 08 Apr 2013, Junio C Hamano wrote: Aaron Schrab writes: Good catch. I'll fix that in the next version. Thanks. The patch otherwise looks good to me. Great, I'll plan to send version 2 of this series later today. -- To unsubscribe from this list: send the line "unsubscribe

Re: [PATCH 1/2] clone: Fix error message for reference repository

At 10:57 -0700 08 Apr 2013, Junio C Hamano wrote: In general I am in favor of resolving a gitfile given to --reference when clone interprets it, and have it use the location of the real underlying object store when it grabs objects not in there from the origin and store the location of the real

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

On Mon, Apr 08, 2013 at 01:31:43PM -0500, Felipe Contreras wrote: > > Reviewers have limited time allocated for each individual topic. To > > an original patch with say 3 problems, the review may only point out > > issues in 2 and suggest a concrete improvement for only 1 and that > > is sufficie

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

Felipe Contreras writes: > I'm not talking about the time it took to come up with the criticism > below, I'm talking about the comment regarding the commit message. If > the commit message did indeed provide *zero* explanation, that's > certainly something that should be immediately visible, no?

Re: [PATCH v2 0/7] remote-bzr: generic updates

On Mon, Apr 8, 2013 at 1:26 PM, Junio C Hamano wrote: > Oops. The previous round is already now part of 'master'. All right, rebased and resent. -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More major

[PATCH 2/2] remote-bzr: improve tag handling

revision_history() is deprecated and doesn't do what we want (revno instead of dotted_revno?). Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 25 - 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/contrib/remote-helpers/git-remot

[PATCH 1/2] remote-bzr: fix utf-8 support for fetching

From: Christophe Simonis The previous patches didn't deal with all the scenarios. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 19 +++ contrib/remote-helpers/test-bzr.sh| 9 - 2 files changed, 19 insertions(+), 9 deletions(-) diff --

[PATCH 0/2] remote-bzr: fixes

Hi, Resending because the previous commits were already merged. The second one is probably important. Christophe Simonis (1): remote-bzr: fix utf-8 support for fetching Felipe Contreras (1): remote-bzr: improve tag handling contrib/remote-helpers/git-remote-bzr | 44 +--

tar on Mac does not like empty tar from git archive

Git 1.8.2.1 includes commit bd54cf17 - archive: handle commits with an empty tree Test 2 of t5004-archive-corner-cases, "tar archive of empty tree is empty", fails on Mac OS X 10.8.3 (with XCode 4.6.1) since the tar command exits with return code 1 on the generated tar file. expecting success

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

On Mon, Apr 8, 2013 at 12:43 PM, Junio C Hamano wrote: > Felipe Contreras writes: > >> On Sun, Apr 7, 2013 at 9:33 PM, Jeff King wrote: >>> On Sun, Apr 07, 2013 at 09:03:25PM -0500, Felipe Contreras wrote: >> And you think that is desirable? User-friendly? >>> >>> No, as you probably realiz

Re: [PATCH v2 0/7] remote-bzr: generic updates

Oops. The previous round is already now part of 'master'. -- 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

RFC: two minor tweaks to check-ignore to help git-annex assistant

Hi all, I was recently informed by the author of git-annex that my implementation of git check-ignore has two minor deficiencies which currently prevent him from adding .gitignore support to the git-annex assistant (web UI): 1. When accepting a list of files to check via --stdin, no results

Re: [PATCH v4] transport-helper: report errors properly

On Mon, Apr 8, 2013 at 7:40 AM, Felipe Contreras wrote: > + die("Reading from remote helper failed"); Does the user know what a remote helper is? Could we point them at some helpful docs in case they don't? -- Cheers, Sverre Rabbelier -- To unsubscribe from this list: send the lin

[PATCH 2/2] count-objects: add -H option to humanize sizes

Use the new humanize() function to print loose objects size, pack size, and garbage size in verbose mode, or loose objects size in regular mode. This patch doesn't change the way anything is displayed when the option is not used. Also update the documentation. Signed-off-by: Antoine Pelisse ---

[PATCH 1/2] progress: create public humanize() to show sizes

Currently, humanization of downloaded size is done in the same function as text formatting. This is an issue if anyone else wants to use this. Separate text formatting from size simplification and make the function public so that it can easily be used by other clients. We now can use humanize() f

Re: [PATCH 1/2] rev-parse: add --filename-prefix option

John Keeping writes: > On Mon, Apr 08, 2013 at 08:07:32AM -0700, Junio C Hamano wrote: >> John Keeping writes: >> >> > Yes (ish), the intended usage is something like this: >> > >> > prefix=$(git rev-parse --show-prefix) >> > cd_to_toplevel >> > ... parse options here ... >> > #

Re: [RFC/PATCH 0/7] Rework git core for native submodules

Ramkumar Ramachandra writes: > 1. Having a toplevel .gitmodules means that any git-core command like > add/ rm/ mv will be burdened with looking for the .gitmodules at the > toplevel of the worktree and editing it appropriately along with > whatever it was built to do (ie. writing to the index an

Re: [PATCH 2/2] clone: Allow repo using gitfile as a reference

[ADMINISTRIVIA: please do not redirect a direct reply to you to other people using Mail-Followup-To.] Aaron Schrab writes: > At 16:51 -0700 07 Apr 2013, Jonathan Nieder wrote: >>> - char *ref_git; >>> + char *ref_git, *repo; >>[...] >>> + repo = (char *)read_gitfile(mkpath("%s/.git", ref_

Re: [PATCH 1/2] clone: Fix error message for reference repository

Aaron Schrab writes: > At 08:30 -0700 08 Apr 2013, Junio C Hamano wrote: >>You switch to a version of the superproject with a plain file at >>dirA/ or there is nothing at dirA. The checkout will fail and you >>need to manually rectify the situation [*1*], but after that is >>done, you do not ha

Re: git-am doesn't apply the rest of the email after a partial patch fail?

"Constantine A. Murenin" writes: > However, what I've faced with, is that when a conflict happens, and I > resolve, and do `git add`, and `git am --resolved`, then the rest of > the `format-patch` email where the conflict has occurred is discarded, That is unusual. Are you using any other optio

Re: [PATCH v3 2/2] transport-helper: check if remote helper is alive

Felipe Contreras writes: > On Sun, Apr 7, 2013 at 9:33 PM, Jeff King wrote: >> On Sun, Apr 07, 2013 at 09:03:25PM -0500, Felipe Contreras wrote: > >>> And you think that is desirable? User-friendly? >> >> No, as you probably realized if you read the rest of my email. My point >> in bringing it u

Re: [PATCH 1/2] rev-parse: add --filename-prefix option

On Mon, Apr 08, 2013 at 08:07:32AM -0700, Junio C Hamano wrote: > John Keeping writes: > > > Yes (ish), the intended usage is something like this: > > > > prefix=$(git rev-parse --show-prefix) > > cd_to_toplevel > > ... parse options here ... > > # Convert remaining arguments (fil

[PATCH v2 6/7] remote-bzr: add utf-8 support for fetching

From: Christophe Simonis Initial patch by Timotheus Pokorra. [fc: added tests] Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 15 +-- contrib/remote-helpers/test-bzr.sh| 32 2 files changed, 41 insertions(+), 6 dele

[PATCH v2 7/7] remote-bzr: add utf-8 support for pushing

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 6 ++ contrib/remote-helpers/test-bzr.sh| 31 +++ 2 files changed, 37 insertions(+) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 6

[PATCH v2 5/7] remote-bzr: improve tag handling

If the tags don't have an associated revision, there's nothing we can do with them, skip them. Also, let's skip the ones git can't handle. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 25 ++--- 1 file changed, 18 insertions(+), 7 deletions(-) d

[PATCH v2 3/7] remote-bzr: set author if available

From: David Engster [fc: added tests] Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 7 ++- contrib/remote-helpers/test-bzr.sh| 15 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/cont

[PATCH v2 4/7] remote-bzr: only update workingtree on local repos

Apparently, that's the only way it's possible. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index a99a924..9466cb9 100

[PATCH v2 2/7] remote-bzr: remove files before modifications

From: Christophe Simonis Allow re-add of a deleted file in the same commit. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remo

[PATCH v2 1/7] remote-bzr: fix directory renaming

From: Christophe Simonis Git does not handle directories, renaming a directory is renaming every files in this directory. [fc: added tests] Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 8 +++- contrib/remote-helpers/test-bzr.sh| 24 +

[PATCH v2 0/7] remote-bzr: generic updates

Hi, Basically the same couple of fixes, plus a fixed fix. Christophe Simonis (3): remote-bzr: fix directory renaming remote-bzr: remove files before modifications remote-bzr: add utf-8 support for fetching David Engster (1): remote-bzr: set author if available Felipe Contreras (3): re

[PATCH v3 01/20] remote-hg: trivial cleanups

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 328c2dc..d0dfb1e 100755 --- a/contrib/remote-helpers/git-remot

[PATCH v3 15/20] remote-hg: add basic author tests

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 35 +++ 1 file changed, 35 insertions(+) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 5f81dfa..62e3a47 100755 --- a/contrib/remote-helpers/test-hg.

[PATCH v3 20/20] remote-hg: fix bad file paths

Mercurial allows absolute file paths, and Git doesn't like that. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg in

[PATCH v3 19/20] remote-hg: document location of stored hg repository

From: Simon Ruderich Signed-off-by: Simon Ruderich Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index a02ec68..37e6aec 100755 --- a/co

[PATCH v3 18/20] remote-hg: fix bad state issue

The problem reportedly happened after doing a push that fails, the abort causes the state of remote-hg to go bad, this happens because remote-hg's marks are not stored, but 'git fast-export' marks are. Ensure that the marks are _always_ stored. Signed-off-by: Felipe Contreras --- contrib/remote

[PATCH v3 17/20] remote-hg: add 'insecure' option

From: Simon Ruderich If set to true acts as hg's clone/pull --insecure option. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 9 + 1 file changed, 9 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg inde

[PATCH v3 14/20] remote-hg: show more proper errors

When cloning or pushing fails, we don't want to show a stack-trace. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-

[PATCH v3 11/20] remote-hg: update tags globally

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index b54de1e..bccdf4e 100755 --- a/contrib/remote-helpers/git-remote-hg +

[PATCH v3 08/20] remote-hg: split bookmark handling

Will be useful for remote bookmarks. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 39 +++- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg in

[PATCH v3 07/20] remote-hg: redirect buggy mercurial output

Mercurial emits messages like "searching for changes", "no changes found", etc. meant for the use of its own UI layer, which break the pipe between transport helper and remote helper. Since there's no way to silence Mercurial, let's redirect to standard error. Signed-off-by: Felipe Contreras ---

[PATCH v3 04/20] remote-hg: fix for files with spaces

From: Peter van Zetten Set the maximum number of splits to make when dividing the diff stat lines based on space characters. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/g

[PATCH v3 13/20] remote-hg: force remote push

Ideally we shouldn't do this, as it's not recommended in mercurial documentation, but there's no other way to push multiple bookmarks (on the same branch), which would be the behavior most similar to git. At the same time, add a configuration option for the people that don't want to risk creating

  1   2   >