Re: [PATCH 4/8] strbuf: add strbuf_read_once to read without blocking

On Mon, Dec 14, 2015 at 3:16 PM, Eric Sunshine wrote: > On Mon, Dec 14, 2015 at 2:37 PM, Stefan Beller wrote: >> The new call will read from a file descriptor into a strbuf once. The >> underlying call xread_nonblock is meant to execute without

Re: [PATCH v1 4/4] git gui: allow for a long recentrepo list

From: "Eric Sunshine" On Mon, Dec 14, 2015 at 10:09 AM, Philip Oakley wrote: The gui.recentrepo list may be longer than the maxrecent setting. Allow extra space to show any extra entries. In an ideal world, the git gui would limit the number of

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

On Mon, Dec 14, 2015 at 4:16 PM, Jeff King wrote: > On Mon, Dec 14, 2015 at 04:09:01PM -0800, Stefan Beller wrote: > >> > Are we trying to protect ourselves against somebody _else_ giving us a >> > non-blocking descriptor? In that case we'll quietly spin and waste CPU. >> > Which

Re: [PATCH v2 0/3] format-patch: introduce option to suppress commit hashes

On Mon, Dec 14, 2015 at 04:32:39PM -0500, Jeff King wrote: > The intent here makes sense to me, and with the exception of the > test_line_count thing that Torsten mentioned, the code looks good. > > I briefly wondered if the option should simply be "--diffable" or > something like that, and

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

On Mon, Dec 14, 2015 at 03:15:29PM -0800, Junio C Hamano wrote: > -- >8 -- > From: Stefan Beller > Date: Mon, 14 Dec 2015 11:37:13 -0800 > Subject: [PATCH] xread_nonblock: add functionality to read from fds without > blocking > > Provide a wrapper to read(), similar to

[PATCH v3 2/3] format-patch: add an option to suppress commit hash

Oftentimes, patches created by git format-patch will be stored in version control or compared with diff. In these cases, two otherwise identical patches can have different commit hashes, leading to diff noise. Teach git format-patch a --zero-commit option that instead produces an all-zero hash

[PATCH v3 0/3] format-patch: introduce option to suppress commit hashes

git format-patch is often used to create patches that are then stored in version control or displayed with diff. Having the commit hash in the "From " line usually just creates diff noise in these cases, so this series introduces --zero-commit to set that to all zeros. Changes from v2: * Improve

[PATCH v3 1/3] Introduce a null_oid constant.

null_oid is the struct object_id equivalent to null_sha1. Signed-off-by: brian m. carlson --- cache.h | 1 + sha1_file.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cache.h b/cache.h index 5ab6cb50..c63fcc11 100644 --- a/cache.h +++ b/cache.h @@

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

On Mon, Dec 14, 2015 at 04:09:01PM -0800, Stefan Beller wrote: > > Are we trying to protect ourselves against somebody _else_ giving us a > > non-blocking descriptor? In that case we'll quietly spin and waste CPU. > > Which isn't great, but perhaps better than returning an error. > > Yes. > This

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

On Mon, Dec 14, 2015 at 04:25:18PM -0800, Stefan Beller wrote: > > But yeah, I think simply using xread() as-is in strbuf_read_once (or > > whatever it ends up being called) is OK. > > I was actually thinking about using {without-x}read, just the plain system > call. > Do we have any issues

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

On Mon, Dec 14, 2015 at 3:57 PM, Jeff King wrote: > On Mon, Dec 14, 2015 at 03:15:29PM -0800, Junio C Hamano wrote: > >> -- >8 -- >> From: Stefan Beller >> Date: Mon, 14 Dec 2015 11:37:13 -0800 >> Subject: [PATCH] xread_nonblock: add functionality to read from

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

Jeff King writes: > Are we trying to protect ourselves against somebody _else_ giving us a > non-blocking descriptor? In that case we'll quietly spin and waste CPU. > Which isn't great, but perhaps better than returning an error. I think I said it earlier in a message upthread.

[PATCH v3 3/3] format-patch: check that header line has expected format

The format of the "From " header line is very specific to allow utilities to detect Git-style patches. Add a test that the patches created are in the expected format. Signed-off-by: brian m. carlson --- t/t4014-format-patch.sh | 7 +++ 1 file changed, 7

Questions about GIT

Hi I’ve recently been made aware of GIT and had a few questions. I’m currently working on creating a middleware between FORAN (a CAD system) and Teamcenter. Do you know if GIT would work between the two? We’re currently using a Centralised version control system. So to check my understanding,

Re: [PATCH 7/8] config: add core.untrackedCache

On Tue, Dec 8, 2015 at 11:43 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Christian Couder writes: >> >>> When we know that mtime is fully supported by the environment, we >>> might want the untracked cache to be

[PATCH v1 3/4] git gui: de-dup selected repo from recentrepo history

When the gui/user selects a repo for display, that repo is brought to the end of the recentrepo config list. The logic can fail if there are duplicate old entries for the repo (you cannot unset a single config entry when duplicates are present). Similarly, the maxrecentrepo logic could fail if

[PATCH v1 1/4] git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

The git gui's recent repo list may become contaminated with duplicate entries. The git gui would barf when attempting to remove one entry. Remove them all - there is no option within 'git config' to selectively remove one of the entries. This issue was reported on the 'Git User' list

[PATCH v1 0/4] Fix git-gui when recentrepo list has duplicates

This is the patch series which follows from a user report of not being able to start the git-gui when it contained duplicate entries. The git gui design assumes that there will never be duplicate entries in the recent repo list, and attempts to keep it that way. For reasons unknown (other

[PATCH v1 4/4] git gui: allow for a long recentrepo list

The gui.recentrepo list may be longer than the maxrecent setting. Allow extra space to show any extra entries. In an ideal world, the git gui would limit the number of entries to the maxrecent setting, however the recentrepo config list may have been extended outwith the gui, or the maxrecent

[PATCH v1 2/4] git gui: cope with duplicates in _get_recentrepo

_get_recentrepo will fail if duplicate invalid entries are present in the recentrepo config list. The previous commit fixed the 'git config' limitations in _unset_recentrepo by unsetting all config entries, however this code would fail on the second attempt to unset it. Refactor the code to

Re: [PATCH 3/3] ident: loosen getpwuid error in non-strict mode

On Thu, Dec 10, 2015 at 04:41:29PM -0500, Jeff King wrote: > -static struct passwd *xgetpwuid_self(void) > +static struct passwd *xgetpwuid_self(int *is_bogus) > { > struct passwd *pw; > > errno = 0; > pw = getpwuid(getuid()); > - if (!pw) > - die(_("unable to

[PATCH 1/2] push: add '--delete' flag to synopsis

The delete flag is not mentioned in the synopsis of `git-push`. Add the flag to make it more discoverable. Signed-off-by: Patrick Steinhardt --- Documentation/git-push.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-push.txt

[PATCH 2/2] push: add '-d' as shorthand for '--delete'

It is only possible to delete branches on remotes by specifying the long '--delete' flag. The `git-branch` command, which can be used to delete local branches with the same '--delete' flag, also accepts the shorthand '-d'. This may cause confusion for users which are frequently using the shorthand

Where does http.sslcainfo get set in Windows (2.6.3)?

Hi all, I'm in Windows using git version: git version 2.6.3.windows.1. Git is installed to /c/Users/tbarik/AppData/Local/Programs/Git/cmd/git. However, when I look for the config name http.sslcainfo, it returns: $ git config --get-all http.sslcainfo C:/Program

Re: [PATCH 2/2] rebase: fix preserving commits with --keep-empty

On Thu, Dec 10, 2015 at 02:58:06PM -0800, Michael Blume wrote: > This test does not seem to pass on my mac. > > I've placed the verbose output here: > https://gist.github.com/MichaelBlume/db7ba222be001d502e57 > > On Fri, Nov 20, 2015 at 4:04 AM, Patrick Steinhardt wrote: > > When

Re: Questions about GIT

On Mon, Dec 14, 2015 at 2:48 AM, Jack McLear wrote: > Hi > > I’ve recently been made aware of GIT and had a few questions. > I’m currently working on creating a middleware between FORAN (a CAD system) > and Teamcenter. > > Do you know if GIT would work between the two?

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

Am 15.12.2015 um 01:25 schrieb Stefan Beller: I was actually thinking about using {without-x}read, just the plain system call. Do we have any issues with that for wrapping purposes for Windows? xread() limits the size being read to MAX_IO_SIZE, which is needed on some systems (I think that

RE: Why does send-pack call pack-objects for all remote refs?

> You might also try repacking with "git repack -adb", which will > build reachability bitmaps. Pack-objects can use them to compute > the set of required objects much faster. Running "git repack -adb" caused my push time to incease by about 5x. I made some fresh clones and tried other options

[no subject]

Sent from my iPhone -- 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

git bisect with temporary commits

Hi! Today I bisected a bug which required cherry-picking an (unrelated) compile fix later in the history so I could test the commits. After testing a commit, I didn't reset to the commit before the cherry-picked one, which seemed to work well, but doesn't in my minimal example: $ git init

Re: What's "wrong" with this fast-import?

On 2015-12-13T01:53:39 +0100 SZEDER Gábor wrote: > All changes > compared to the first parent (i.e. the addition of that new readme file > on the side branch) have to be listed explicitly. > Apologies for the delay: Thanks for this! It seems that this issue was actually

Re: Where does http.sslcainfo get set in Windows (2.6.3)?

Hi Titus, try to look here: C:\Users\All Users\Git\config (that's where I found it... maybe different on your end). Cheers, Lars > On 14 Dec 2015, at 16:45, Titus Barik wrote: > > Hi all, > > I'm in Windows using git version: git version 2.6.3.windows.1. Git is > installed

Corruption of branch?

Hello, I have a repository (which I unfortunately cannot provide access to) which is having some odd things happening with one (and only one) of its branches. This workflow repeats the issue (here `bad_branch` is one of the remotes branches; i.e. `origin/bad_branch`): (1) clone the

Re: git bisect with temporary commits

On Mon, Dec 14, 2015 at 01:17:03PM -0800, Junio C Hamano wrote: > Jeff King writes: > > >> You should instead tell git that HEAD^ is good, since that is what git > >> asked you to test. > > > > Another alternative is to use "git cherry-pick -n" to create a working > > tree state

Re: [PATCH 7/8] config: add core.untrackedCache

Junio C Hamano writes: > If you stop thinking that "update-index --untracked-cache" is > somehow a "configuration", things will get clearer to you. > ... >> "git update-index --[no-|force-]untracked-cache" is a bad way, so >> let's make it easy for people to not use it at all.

Re: [PATCH v2 0/3] format-patch: introduce option to suppress commit hashes

On Sun, Dec 13, 2015 at 05:27:15PM +, brian m. carlson wrote: > git format-patch is often used to create patches that are then stored in > version control or displayed with diff. Having the commit hash in the > "From " line usually just creates diff noise in these cases, so this > series

Re: [PATCH 6/8] run-command: add an asynchronous parallel child processor

On Mon, Dec 14, 2015 at 12:39 PM, Johannes Sixt wrote: > > I can't quite parse the first sentence in this paragraph. Perhaps something > like this: > > To detect when a child has finished executing, we check interleaved > with other actions (such as checking the liveliness of

Re: [PATCH v2 2/3] format-patch: add an option to suppress commit hash

"brian m. carlson" writes: > +test_expect_success 'format-patch --zero-commit' ' > + git format-patch --zero-commit --stdout v2..v1 >patch2 && > + cnt=$(egrep "^From 0{40} Mon Sep 17 00:00:00 2001" patch2 | wc -l) && > + test $cnt = 3 > +' This test is

Re: [PATCH v2 3/3] format-patch: check that header line has expected format

"brian m. carlson" writes: > +test_expect_success 'From line has expected format' ' > + git format-patch --stdout v2..v1 >patch2 && > + cnt=$(egrep "^From [0-9a-f]{40} Mon Sep 17 00:00:00 2001" patch2 | wc > -l) && Also, with $_x40, you do not need egrep.

Re: Corruption of branch?

In the .git/config there is no [branch "frus"] section. At first this is expected (i.e. cleaning cloning), but nothing changes when I execute `git checkout frus`. When I execute `git checkout frus_body_cleaning` that gets added to .git/config as expected. .git/refs/heads contains two files

Re: git bisect with temporary commits

Florian Bruhin writes: > I see - but wouldn't it make more sense for a "git bisect good" (or > bad, respectively) without arguments to assume I mean the commit > bisect checked out for me, not HEAD? The problem is that there is nothing that marks the originally checked

Re: Corruption of branch?

On ma, 2015-12-14 at 14:59 -0500, Thomas Nyberg wrote: > I'm guessing you're looking for namecollisions of some kind? I was thinking the same. Can you share the (sanitised) output of git for-each-ref? -- Dennis Kaarsemaker www.kaarsemaker.net -- To unsubscribe from this list: send the line

compile error in Git v2.7.0-rc0

Probably because I have NO_IPV6 defined. ident.c: In function ‘canonical_name’: ident.c:89:37: error: ‘buf’ undeclared (first use in this function) struct hostent *he = gethostbyname(buf); ^ ident.c:89:37: note: each undeclared identifier is reported only

Re: Corruption of branch?

What exactly are you looking for? Here's the results of the following command: $ git for-each-ref | grep frus 1750cba5a94b3fe6041aaf49de430a558a3b9bc8 commit refs/heads/frus_body_cleaning 3a1dbe48299f6eda1cc4b69cab35284c0f0355eb commit refs/remotes/origin/frus

Re: compile error in Git v2.7.0-rc0

johan defries writes: > Probably because I have NO_IPV6 defined. > > ident.c: In function ‘canonical_name’: > ident.c:89:37: error: ‘buf’ undeclared (first use in this function) > struct hostent *he = gethostbyname(buf); > ^ >

Re: Corruption of branch?

On Mon, Dec 14, 2015 at 9:40 AM, Thomas Nyberg wrote: > Hello, > > I have a repository (which I unfortunately cannot provide access to) which > is having some odd things happening with one (and only one) of its branches. > This workflow repeats the issue (here `bad_branch` is

Re: git bisect with temporary commits

Florian Bruhin writes: > Now when trying to say it's good (and forgetting to remove the > temporary commits), I get this: > > $ git bisect good > Bisecting: a merge base must be tested > [981e1093dae24b37189bcba2dd848b0c3388080c] still good and does not compile

Re: [PATCH/RFC 00/10] ref-filter: use parsing functions

Eric Sunshine writes: > On Fri, Dec 11, 2015 at 5:49 PM, Junio C Hamano wrote: >> Karthik Nayak writes: >>> ref-filter: introduce a parsing function for each atom in valid_atom >>> ref-filter: introduce struct used_atom >>>

Re: git bisect with temporary commits

Florian Bruhin writes: > * Andreas Schwab [2015-12-14 19:08:48 +0100]: >> Florian Bruhin writes: >> >> > Now when trying to say it's good (and forgetting to remove the >> > temporary commits), I get this: >> > >> > $ git

Re: sb/submodule-parallel-fetch,

On Fri, Dec 11, 2015 at 3:07 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Fri, Dec 11, 2015 at 1:37 PM, Johannes Sixt wrote: >>> >>> Generally, I'm already quite satisfied with the state of the >>> infrastructure at the tip of

[PATCH 1/8] submodule.c: write "Fetching submodule " to stderr

From: Jonathan Nieder The "Pushing submodule " progress output correctly goes to stderr, but "Fetching submodule " is going to stdout by mistake. Fix it to write to stderr. Noticed while trying to implement a parallel submodule fetch. When this particular output line went

[PATCH 0/8] Rerolling sb/submodule-parallel-fetch for the time after 2.7

I am sending out a new version for replacing sb/submodule-parallel-fetch for the time after the 2.7 release. The content are * all patches as in the branch sb/submodule-parallel-fetch * inlcuding the fixups as suggested by Hannes, * write a message to the debug log for better testing and

[PATCH 4/8] strbuf: add strbuf_read_once to read without blocking

The new call will read from a file descriptor into a strbuf once. The underlying call xread_nonblock is meant to execute without blocking if the file descriptor is set to O_NONBLOCK. It is a bug to call strbuf_read_once on a file descriptor which would block. Signed-off-by: Stefan Beller

Re: [PATCH 7/8] config: add core.untrackedCache

Christian Couder writes: > In fact "git update-index --[no-|force-]untracked-cache" is very bad > because it means that two repositories can be configured differently > even if they have the same config files. If you stop thinking that "update-index

Re: [PATCH v2 3/3] format-patch: check that header line has expected format

"brian m. carlson" writes: > The format of the "From " header line is very specific to allow > utilities to detect Git-style patches. Add a test that the patches > created are in the expected format. > > Signed-off-by: brian m. carlson

Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths

Luke Diamand writes: > Having just fixed this, I've now just spotted that Sam Hocevar's fix > to reduce the number of P4 transactions also fixes it: > > https://www.mail-archive.com/git%40vger.kernel.org/msg81880.html > > That seems like a cleaner fix. Hmm, do you mean I

Re: [PATCH 2/2] push: add '-d' as shorthand for '--delete'

Patrick Steinhardt writes: > It is only possible to delete branches on remotes by specifying > the long '--delete' flag. Not really. "git push origin :unnecessary-branch" should just work with out "--delete" or "-d". -- To unsubscribe from this list: send the line "unsubscribe

Re: Corruption of branch?

On Mon, 2015-12-14 at 13:08 -0500, Thomas Nyberg wrote: > Hi Stefan thanks for much for the response! So I compiled release > version 2.6.4 as well as the current master branch on the git git > repository (2.7.0.rc0.20.g4b9ab0e) and the problem persists on both. > > To answer your questions,

[PATCH 2/8] xread: poll on non blocking fds

>From the man page: EAGAIN The file descriptor fd refers to a file other than a socket and has been marked nonblocking (O_NONBLOCK), and the read would block. EAGAIN or EWOULDBLOCK The file descriptor fd refers to a socket and has been marked nonblocking (O_NONBLOCK),

[PATCH 5/8] sigchain: add command to pop all common signals

The new method removes all common signal handlers that were installed by sigchain_push. CC: Jeff King Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- sigchain.c | 9 + sigchain.h | 1 + 2 files changed, 10

[PATCH 8/8] submodules: allow parallel fetching, add tests and documentation

This enables the work of the previous patches. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- Documentation/fetch-options.txt | 7 +++ builtin/fetch.c | 6 +- builtin/pull.c | 6 ++

[PATCH 7/8] fetch_populated_submodules: use new parallel job processing

In a later patch we enable parallel processing of submodules, this only adds the possibility for it. So this change should not change any user facing behavior. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule.c | 142

[PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

Provide a wrapper to read(), similar to xread(), that restarts on EINTR but not EAGAIN (or EWOULDBLOCK). This enables the caller to handle polling itself, possibly polling multiple sockets or performing some other action. Helped-by: Jacob Keller Helped-by: Jeff King

[PATCH 6/8] run-command: add an asynchronous parallel child processor

This allows to run external commands in parallel with ordered output on stderr. If we run external commands in parallel we cannot pipe the output directly to the our stdout/err as it would mix up. So each process's output will flow through a pipe, which we buffer. One subprocess can be directly

Re: git bisect with temporary commits

* Junio C Hamano [2015-12-14 11:21:06 -0800]: > Florian Bruhin writes: > > > * Andreas Schwab [2015-12-14 19:08:48 +0100]: > >> Florian Bruhin writes: > >> > >> > Now when trying to say it's good (and

Re: Corruption of branch?

Hi Stefan thanks for much for the response! So I compiled release version 2.6.4 as well as the current master branch on the git git repository (2.7.0.rc0.20.g4b9ab0e) and the problem persists on both. To answer your questions, there are no weird characters. The name of the bad_branch is

Re: git bisect with temporary commits

* Andreas Schwab [2015-12-14 19:08:48 +0100]: > Florian Bruhin writes: > > > Now when trying to say it's good (and forgetting to remove the > > temporary commits), I get this: > > > > $ git bisect good > > Bisecting: a merge base must be

Re: [PATCH] refs: mark some symbols static

Will do. On Sat, 2015-12-12 at 14:33 +, Ramsay Jones wrote: > Signed-off-by: Ramsay Jones > --- > > Hi David, > > If you need to re-roll your 'dt/refs-backend-lmdb' branch, could > you please squash the relevant parts of this patch into yours. > > [yes, I

Re: [PATCH jk/prune-mtime] prune: close directory earlier during loose-object directory traversal

Johannes Schindelin writes: >> > Sorry for reviving this old thread, but I noticed that we do not >> > have this patch in our tree yet. I'll queue to 'pu' for now lest I >> > forget. If I missed a good argument or concensus against the change >> > please let me

git-svn does not honor preserve-empty-dirs

Hi I think git-svn 2.6.4 does not behave as intended. According to the documentation preserve-empty-dirs should ensure that empty- directories are kept in all cases: "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion. This includes directories

Re: Why does send-pack call pack-objects for all remote refs?

Jeff King wrote: > Hmm. I guess that makes sense. The bitmap we want is the set difference > between the objects we are sending, and the tips the other side has. If > we have a bitmap at each ref tip, that's very fast. But if you have a > very large number of refs, we don't make one for each ref,

Re: [PATCH v1 4/4] git gui: allow for a long recentrepo list

On Mon, Dec 14, 2015 at 10:09 AM, Philip Oakley wrote: > The gui.recentrepo list may be longer than the maxrecent setting. > Allow extra space to show any extra entries. > > In an ideal world, the git gui would limit the number of entries > to the maxrecent setting, however

Re: Why does send-pack call pack-objects for all remote refs?

On Mon, Dec 14, 2015 at 02:31:55PM -0800, Jonathan Nieder wrote: > > I suspect there's room for improvement in the way we select commits to > > store bitmaps for (so that the average walk is smaller). But it's rather > > tricky; there's not a single constant to change to make it work better. > >

Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths

Luke Diamand writes: > On 14 December 2015 at 19:16, Junio C Hamano wrote: >> Luke Diamand writes: >> >>> Having just fixed this, I've now just spotted that Sam Hocevar's fix >>> to reduce the number of P4 transactions also fixes it: >>>

Publish Research Papers

To Research Authors (Professor/Doctor/Lecturer/Student), Please be informed that your are invited to submit your articles for publication in our esteem journal. Your articles will undergo language copy-editing, typesetting, and reference validation in order to provide the highest publication

Re: [PATCH v1 1/4] git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

On Monday, December 14, 2015, Philip Oakley wrote: > The git gui's recent repo list may become contaminated with duplicate > entries. The git gui would barf when attempting to remove one entry. > Remove them all - there is no option within 'git config' to selectively >

Re: [PATCH 0/8] Rerolling sb/submodule-parallel-fetch for the time after 2.7

Am 14.12.2015 um 20:37 schrieb Stefan Beller: I am sending out a new version for replacing sb/submodule-parallel-fetch for the time after the 2.7 release. The content are * all patches as in the branch sb/submodule-parallel-fetch * inlcuding the fixups as suggested by Hannes, * write a

Re: Corruption of branch?

wow right on the button. yeah i have the "frus" folder in the root of my repository. i never knew that git checkout also searches the root of the repository like that. it appears i'm a fool who doesn't read documentation... i learned something knew and can move this from the "bizarre index

Re: compile error in Git v2.7.0-rc0

On Mon, Dec 14, 2015 at 03:46:25PM -0500, Jeff King wrote: > I don't think that fix is right, though. We should be passing "host" to > gethostbyname. Here it is in patch form. It can go on top of ep/ident-with-getaddrinfo. -- >8 -- Subject: [PATCH] ident: fix undefined variable when NO_IPV6 is

Re: [PATCH 0/2] git-p4: fix for handling of multiple depot paths

On 14 December 2015 at 19:16, Junio C Hamano wrote: > Luke Diamand writes: > >> Having just fixed this, I've now just spotted that Sam Hocevar's fix >> to reduce the number of P4 transactions also fixes it: >> >>

Re: [PATCH 0/8] Rerolling sb/submodule-parallel-fetch for the time after 2.7

Johannes Sixt writes: > Am 14.12.2015 um 20:37 schrieb Stefan Beller: >> I am sending out a new version for replacing sb/submodule-parallel-fetch for >> the time after the 2.7 release. >> >> The content are >> * all patches as in the branch sb/submodule-parallel-fetch >> *

Re: query regarding git merge

On Sun, Dec 13, 2015 at 07:23:17PM +, brian m. carlson wrote: > On Mon, Dec 14, 2015 at 12:03:18AM +0530, Rohit Gupta wrote: > > Thanks brian. I understood my mistake in understanding the working of git > > merge. > > But isn't it wrong? As after merging, branch's logic can't work. How to get

Re: Why does send-pack call pack-objects for all remote refs?

On Mon, Dec 14, 2015 at 01:47:39PM +, Daniel Koverman wrote: > > You might also try repacking with "git repack -adb", which will > > build reachability bitmaps. Pack-objects can use them to compute > > the set of required objects much faster. > > Running "git repack -adb" caused my push time

Re: [PATCH 2/2] push: add '-d' as shorthand for '--delete'

On Mon, Dec 14, 2015 at 04:23:04PM +0100, Patrick Steinhardt wrote: > It is only possible to delete branches on remotes by specifying > the long '--delete' flag. The `git-branch` command, which can be > used to delete local branches with the same '--delete' flag, also > accepts the shorthand

Re: [PATCH 6/8] run-command: add an asynchronous parallel child processor

Am 14.12.2015 um 20:37 schrieb Stefan Beller: This allows to run external commands in parallel with ordered output on stderr. If we run external commands in parallel we cannot pipe the output directly to the our stdout/err as it would mix up. So each process's output will flow through a pipe,

Re: Corruption of branch?

On ma, 2015-12-14 at 15:33 -0500, Thomas Nyberg wrote: > What exactly are you looking for? Here's the results of the following > command: > > $ git for-each-ref | grep frus > 1750cba5a94b3fe6041aaf49de430a558a3b9bc8 commit > refs/heads/frus_body_cleaning >

Re: Corruption of branch?

Dennis Kaarsemaker writes: > That leaves only one option: you also have a file or directory named > 'frus' in the root of your repository. In this case 'git checkout frus' > does the same as 'git checkout -- frus' instead of DWIM'ing 'git > checkout frus' to 'git checkout

Re: compile error in Git v2.7.0-rc0

On Mon, Dec 14, 2015 at 12:35:25PM -0800, Junio C Hamano wrote: > johan defries writes: > > > Probably because I have NO_IPV6 defined. > > > > ident.c: In function ‘canonical_name’: > > ident.c:89:37: error: ‘buf’ undeclared (first use in this function) > > struct

update index mtime etc metadata

Is there any available plumbing that can change the mtime etc metadata that is recorded in the index for a file, to user-provided values? Or, to force the current file stat metadata to be updated in the index? I know, git update-index --refresh, but I have a case where that's too expensive. I'm

Re: [PATCH 3/8] xread_nonblock: add functionality to read from fds without blocking

Stefan Beller writes: > Provide a wrapper to read(), similar to xread(), that restarts on > EINTR but not EAGAIN (or EWOULDBLOCK). This enables the caller to > handle polling itself, possibly polling multiple sockets or performing > some other action. Do you still need this

Re: git bisect with temporary commits

On Mon, Dec 14, 2015 at 07:08:48PM +0100, Andreas Schwab wrote: > Florian Bruhin writes: > > > Now when trying to say it's good (and forgetting to remove the > > temporary commits), I get this: > > > > $ git bisect good > > Bisecting: a merge base must be tested >

Re: compile error in Git v2.7.0-rc0

On Mon, Dec 14, 2015 at 12:52 PM, Jeff King wrote: > On Mon, Dec 14, 2015 at 03:46:25PM -0500, Jeff King wrote: > >> I don't think that fix is right, though. We should be passing "host" to >> gethostbyname. > > Here it is in patch form. It can go on top of

Downloading for mac.

Hello it seems that the download for mac isn’t working on your website. Any other location I can download it from? https://git-scm.com/download/mac-- 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

Re: git bisect with temporary commits

Jeff King writes: >> You should instead tell git that HEAD^ is good, since that is what git >> asked you to test. > > Another alternative is to use "git cherry-pick -n" to create a working > tree state that you can test, but leave HEAD at the original commit. > Then "git bisect

[PATCHv6 0/8] Expose submodule parallelism to the user

This is a resend of sb/submodule-parallel-update and is available at github[1] as well. What does it do? --- This series should finish the on going efforts of parallelizing submodule network traffic. The patches contain tests for clone, fetch and submodule update to use the actual parallelism

[PATCH 1/8] submodule-config: keep update strategy around

We need the submodule update strategies in a later patch. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- submodule-config.c | 11 +++ submodule-config.h | 1 + 2 files changed, 12 insertions(+) diff --git a/submodule-config.c

[PATCH 3/8] submodule-config: remove name_and_item_from_var

`name_and_item_from_var` does not provide the proper abstraction we need here in a later patch. Signed-off-by: Stefan Beller --- submodule-config.c | 48 1 file changed, 16 insertions(+), 32 deletions(-) diff --git

[PATCH 5/8] fetching submodules: respect `submodule.fetchJobs` config option

This allows to configure fetching and updating in parallel without having the command line option. This moved the responsibility to determine how many parallel processes to start from builtin/fetch to submodule.c as we need a way to communicate "The user did not specify the number of parallel

[PATCH 2/8] submodule-config: drop check against NULL

Adhere to the common coding style of Git and not check explicitly for NULL throughout the file. There are still other occurrences in the code base but that is usually inside of conditions with side effects. Signed-off-by: Stefan Beller --- submodule-config.c | 8 1

[PATCH 8/8] clone: allow an explicit argument for parallel submodule clones

Just pass it along to "git submodule update", which may pick reasonable defaults if you don't specify an explicit number. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 6 +- builtin/clone.c | 19 +--

  1   2   >