Re: [PATCH 1/4] remote-mediawiki: add namespace support

2017-10-29 Thread Kevin
th or a user of Mediawiki or with the Git > bridging, and I don't know what page names look like, but I'm pretty > well convinced from reading both the existing code and this patch that > the changes to get_mw_namespace_id_for_page() are really just a bug > fix to that function.

Re: Git on Mac - Segmentation fault:11

2017-11-16 Thread Kevin
cc: mailinglist On Thu, Nov 16, 2017 at 9:40 PM, Frank Burkitt wrote: > Kevin - > > Thank you for getting back to me. > > The version of Git is 2.15.0 > I used Brew to install it > I am not getting any segfaults from other apps > When I do a ‘git init’ I get a Segmentatio

Re: howto to run git without a master branch

2014-03-09 Thread Kevin
HEAD on the remote repo is indeed used to determine what to check out when cloning. It's quite normal to change it to anything you like. To change it, you usually use git symbolic-ref HEAD master-x instead of directly editing that file. On Sun, Mar 9, 2014 at 8:54 PM, Carlos Pereira wrote: > On 0

Re: Configuring a third-party git hook

2014-03-20 Thread Kevin
On Wed, Mar 19, 2014 at 12:16 PM, Chris Angelico wrote: > Two parts to the question, then. Firstly, is it acceptable to use 'git > config' for a hook like this? And secondly, either: Is there a naming > convention to follow? or, what alternative would you recommend? 1. I would say yes. git config

Re: the ".git" folder

2014-04-20 Thread Kevin
Another way, which wouldn't require environment variables or extra parameters for each command is moving the .git directory, and replace it with a file called .git, which has the path to the actual .git directory. Git submodules use this feature too. On Sun, Apr 20, 2014 at 11:49 AM, Duy Nguyen

Re: confused about remote branch management

2014-07-23 Thread Kevin
On Jul 23, 2014 5:11 AM, "Ross Boylan" wrote: > > My local master branch is the result of a merge of upstream master and > some local changes. I want to merge in more recent upstream work. > git pull doesn't seem to have updated origin/master, and git checkout > origin/master also doesn't seem to

Error in documentation for @{-n} in gitrevisions

2014-01-11 Thread Kevin
While discussing the behavior of "git checkout -", I apparently was confused because the documentation states: The construct @{-} means the th branch checked out before the current one. But experimenting with it, it also takes you back to previously checkout commits. git-checkout-at-minus-on

Re: Git Bash for Mac

2014-12-02 Thread Kevin
On Tue, Dec 2, 2014 at 1:21 PM, Nizamuddin Chowdhury wrote: > Good Morning, > > My name is Sefath, and I was wondering when i could start using Git for Mac. > I’m completely new to coding, and I wanted to start with HTML. However, when > I tried installing git bash on my mac, it doesn’t work. Ma

Re: confusion with some `git reset` commands

2014-12-18 Thread Kevin
On Tue, Dec 16, 2014 at 7:39 PM, Arup Rakshit wrote: > Hi, > .. > > But I am looking for any differences - > > a) git reset --soft and git reset --keep git reset --keep is a safer version of git reset --hard. It will reset the working tree. but will abort when it has to overwrite uncomitted chang

Re: git pull not ignoring the file which has been sent to the temporary ignore list

2015-01-24 Thread Kevin
On Sat, Jan 24, 2015 at 10:20:46AM +0630, Arup Rakshit wrote: > On Friday, January 23, 2015 01:14:03 PM you wrote: > > [..] > > There are some configuration files, like `database.yml`, where we > generally put our local DB credentials and we don't want to share such > things. That's why we always

CTRL+Arrow keys don't work with Git Bash for Windows?

2015-01-29 Thread Kevin
. I also see this problem when I use the "bash.exe --login -l" that was installed with MinGW/MSys. Thanks for any suggestions on how to enable this behavior. Kevin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [regression] Newer gits cannot clone any remote repos

2012-11-12 Thread Kevin
Maybe handy to say that you're on a Powerpc platform. On Mon, Nov 12, 2012 at 5:32 PM, Douglas Mencken wrote: > *Any* git clone fails with: > > fatal: premature end of pack file, 106 bytes missing > fatal: index-pack failed > > At first, I tried 1.8.0, and it failed. Then I tried to build 1.7.10.

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-13 Thread Kevin
The problem with input filtering is that you can only filter for one output scenario. What if the the input is going to be output in a wiki like environment, or to pdf, or whatever? Then you have to unescape the data again, and maybe apply filtering/escaping for those environments. You only know h

Re: Fwd: possible Improving diff algoritm

2012-12-12 Thread Kevin
m, lest it would already been fixed. On Wed, Dec 12, 2012 at 7:29 PM, Junio C Hamano wrote: > Kevin writes: > >> Regularly I notice that the diffs that are provided (through diff, or >> add -p) tend to disconnect changes that belong to each other and >> report lines being chan

Re: Find the starting point of a local branch

2012-12-24 Thread Kevin
On Mon, Dec 24, 2012 at 8:31 AM, Woody Wu wrote: > But thanks anyway, I see you guys's discussions and it's a little hard > to understand to me at the moment. Currently, I still have to use gitk > with narrowed outputs. Each commit refers to it's parent. If you take a branch, and keep following t

Re: Links broken in ref docs.

2012-10-30 Thread Kevin
Any follow-up on this? On Tue, Oct 23, 2012 at 7:11 AM, Scott Chacon wrote: > > So, this is due to the major AWS outage today. git-scm.com is hosted > on Heroku and thus on AWS. Heroku is continuing to bring up their > database systems in the wake of the massive AWS outage. Once that is > back

Re: Links broken in ref docs.

2012-10-31 Thread Kevin
Looks fixed here too On Wed, Oct 31, 2012 at 12:30 AM, Mike Norman wrote: > I just checked and the issue seems to be fixed! Clicked around on a > bunch of previously broken links and they work! > > On Tue, Oct 30, 2012 at 3:38 AM, Holger Hellmuth (IKS) > wrote: >> Am 30.10.2012 09:07, schrieb Mi

Re: Wrap commit messages on `git commit -m`

2012-11-01 Thread Kevin
As I see it, the problem is not the possibility to add new lines, but colleagues being too lazy to add them. On Thu, Nov 1, 2012 at 5:29 PM, Lars Gullik Bjønnes wrote: > Ramkumar Ramachandra writes: > > | Hi, >> > | Some of my colleagues are lazy to fire up an editor and write proper > | commit

Re: Egit is not included into eclipse bundles

2012-07-23 Thread Kevin
Hello, Egit is not a part of git. It's not developed by the git developers, so this question is not really fit for this mailing list. You'd have to ask the Eclipse developers why it's not included. Ikke On Fri, Jul 20, 2012 at 11:51 PM, Eugene Sajine wrote: > > Hi, > > I have a strong impressio

Re: Port 22

2013-01-28 Thread Kevin
This is not really a git problem, but more of an ssh problem. Are you in the position to change the port where the SSH daemon listens on? Then you could use a different port which isn't blocked (443 perhaps?). On Sat, Jan 26, 2013 at 7:56 PM, Craig Christensen wrote: > I am currently a student a

Re: wishlist: make it possible to amend commit messages after push to remote

2015-08-07 Thread Kevin Daudt
ing pushed, and is fetched by others. This can be done by setting up refspecs, but it has to be done by everone who uses this repo. One more thing, if you know that no one has fetched the branch you just pushed yet, you can amend the commit and force-push it without any problems (I'd sugget us

[PATCH] pull: allow dirty tree when rebase.autostash enabled

2015-06-02 Thread Kevin Daudt
rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the working tree is dirty when rebase.autostash is not enabled. --- git-pull.sh | 5 - t/t5520-pull.sh | 17 + 2 files changed, 21 insertions(+), 1 deletio

Re: [PATCH v2 17/19] pull --rebase: exit early when the working directory is dirty

2015-06-03 Thread Kevin Daudt
On Wed, Jun 03, 2015 at 02:49:01PM +0800, Paul Tan wrote: > Re-implement the behavior introduced by f9189cf (pull --rebase: exit > early when the working directory is dirty, 2008-05-21). When the option rebase.autoStash is set, it should not be necessary to die in this case. See also this[1] patch

Re: Suggestion: make git checkout safer

2015-06-03 Thread Kevin Daudt
On Wed, Jun 03, 2015 at 09:55:05AM +, Ed Avis wrote: > Jeff King peff.net> writes: > > If my personal experience is anything to go by, newcomers may fall into the > habit of running 'git checkout .' to restore missing files. In the old days > I would often delete a file and then run 'cvs u

[PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test

2015-06-06 Thread Kevin Daudt
Simplify the test case for testing git aborts the pull --rebase when the work tree is dirty. Signed-off-by: Kevin Daudt Helped-by: Paul Tan --- This is a preparation for the next pathch. Changes since v1: - Moved the tests just belof the first --rebase test - Simplified both tests to only test

[PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled

2015-06-06 Thread Kevin Daudt
From: Kevin Daudt rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the working tree is dirty when rebase.autostash is not enabled. Signed-off-by: Kevin Daudt Helped-by: Paul Tan --- git-pull.sh | 5 - t/t5520

Re: [PATCH v2 17/19] pull --rebase: exit early when the working directory is dirty

2015-06-09 Thread Kevin Daudt
On Wed, Jun 03, 2015 at 12:27:16PM +0200, Kevin Daudt wrote: > On Wed, Jun 03, 2015 at 02:49:01PM +0800, Paul Tan wrote: > > Re-implement the behavior introduced by f9189cf (pull --rebase: exit > > early when the working directory is dirty, 2008-05-21). > > When the option re

Re: [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled

2015-06-17 Thread Kevin Daudt
On Thu, Jun 11, 2015 at 09:34:08PM +0800, Paul Tan wrote: > On Sun, Jun 7, 2015 at 5:12 AM, Kevin Daudt wrote: > > From: Kevin Daudt > > > > Signed-off-by: Kevin Daudt > > Ehh? The sign-off does not match the author of the patch. I changed it, but aparently forgot t

[PATCH v3] pull: allow dirty tree when rebase.autostash enabled

2015-06-17 Thread Kevin Daudt
rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the working tree is dirty when rebase.autostash is not enabled. Signed-off-by: Kevin Daudt Helped-by: Paul Tan --- Changes to v2: - Dropped the change of the existing --rebase

kd/

2015-07-05 Thread Kevin Daudt
On Wed, Jun 17, 2015 at 08:36:34AM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > - require_clean_work_tree "pull with rebase" "Please commit or > > stash them." > > + if [ $(git config --bool --get rebase.autostash || e

[PATCH v4] pull: allow dirty tree when rebase.autostash enabled

2015-07-05 Thread Kevin Daudt
rebase learned to stash changes when it encounters a dirty work tree, but git pull --rebase does not. Only verify if the working tree is dirty when rebase.autostash is not enabled. Signed-off-by: Kevin Daudt Helped-by: Paul Tan --- git-pull.sh | 3 ++- t/t5520-pull.sh | 11 +++ 2

Re: [PATCH v5] pull: allow dirty tree when rebase.autostash enabled

2015-07-22 Thread Kevin Daudt
On Tue, Jul 07, 2015 at 11:59:56AM +0800, Paul Tan wrote: > On Mon, Jul 06, 2015 at 01:39:47PM -0700, Junio C Hamano wrote: > > Kevin Daudt writes: > > > > > rebase learned to stash changes when it encounters a dirty work tree, but > > > git pull --rebase does no

Re: [PATCH v5] pull: allow dirty tree when rebase.autostash enabled

2015-07-22 Thread Kevin Daudt
On Wed, Jul 22, 2015 at 12:42:17PM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > On Tue, Jul 07, 2015 at 11:59:56AM +0800, Paul Tan wrote: > > > > Any news about this? Is it still waiting for something? > > Paul's patch was buried in the noise and

Dependencies required for offline installation

2016-07-05 Thread Kevin Paxton
. Does the tarball contain all dependencies already? Should I go that route? Or should I try and find all the rpm's required? Thanks, Kevin Paxton -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordom

Re: Dependencies required for offline installation

2016-07-05 Thread Kevin Paxton
Thank you for the response. I apologize. RHEL 6.5, not 5.5. Would the same version be applicable to 6.5 as well as the dependencies that you mentioned? On Tue, Jul 5, 2016 at 1:53 PM, Dennis Kaarsemaker wrote: > On di, 2016-07-05 at 07:45 -0400, Kevin Paxton wrote: >> Hi, >> &g

[PATCH] Use path comparison for patch ids before the file content

2016-07-14 Thread Kevin Willford
When limiting the list in a revision walk using cherry pick, patch ids are calculated by producing the diff of the content of the files. This would be more efficent by using a patch id looking at the paths that were changed in the commits and only if all the file changed are the same fall back to

[[PATCH v2] 0/4] Use header data patch ids for rebase to avoid loading file content

2016-07-29 Thread Kevin Willford
This patch series is to remove the hand rolled hashmap in the patch_ids and use the hashmap.h implementation. It also introduces the idea of having a header only patch id so that the contents of the files do not have to be loaded in order to determine if two commits are different. Kevin

[[PATCH v2] 1/4] patch-ids: stop using a hand-rolled hashmap implementation

2016-07-29 Thread Kevin Willford
From: Kevin Willford This change will use the hashmap from the hashmap.h to keep track of the patch_ids that have been encountered instead of using an internal implementation. This simplifies the implementation of the patch ids. Signed-off-by: Kevin Willford --- patch-ids.c | 86

[[PATCH v2] 4/4] rebase: avoid computing unnecessary patch IDs

2016-07-29 Thread Kevin Willford
From: Kevin Willford The `rebase` family of Git commands avoid applying patches that were already integrated upstream. They do that by using the revision walking option that computes the patch IDs of the two sides of the rebase (local-only patches vs upstream-only ones) and skipping those local

[[PATCH v2] 3/4] patch-ids: add flag to create the diff patch id using header only data

2016-07-29 Thread Kevin Willford
From: Kevin Willford This will allow a diff patch id to be created using only the header data so that the contents of the file will not have to be loaded. Signed-off-by: Kevin Willford --- diff.c | 16 ++-- diff.h | 2 +- patch-ids.c | 2 +- 3 files changed, 12

[[PATCH v2] 2/4] patch-ids: replace the seen indicator with a commit pointer

2016-07-29 Thread Kevin Willford
From: Kevin Willford The cherry_pick_list was looping through the original side checking the seen indicator and setting the cherry_flag on the commit. If we save off the commit in the patch_id we can set the cherry_flag on the correct commit when running through the other side when a patch_id

BUG: "git checkout -q -b foo origin/foo" is not quiet

2017-02-03 Thread Kevin Layer
$ git checkout -q -b foo origin/foo Branch foo set up to track remote branch foo from origin. I said -q because I didn't want *any* output. I looked at the git sources, on the maint branch, and it appears to still be the case. I see this behavior on 1.7.1. Kevin

feature request: add -q to "git branch"

2017-02-03 Thread Kevin Layer
It should be possible to quietly create a branch. Thanks. Kevin

Re: BUG: "git checkout -q -b foo origin/foo" is not quiet

2017-02-03 Thread Kevin Layer
Note that git version 1.8.3.1 is quiet and does not print the "tracking remote" message. On Fri, Feb 3, 2017 at 10:20 AM, Kevin Layer wrote: > $ git checkout -q -b foo origin/foo > Branch foo set up to track remote branch foo from origin. > > I said -q because I didn'

Re: BUG: "git checkout -q -b foo origin/foo" is not quiet

2017-02-06 Thread Kevin Layer
Yeah, my bad. I was confused. Sorry for the noise. On Fri, Feb 3, 2017 at 4:55 PM, Cornelius Weig wrote: > On 02/03/2017 10:36 PM, Kevin Layer wrote: >> Note that git version 1.8.3.1 is quiet and does not print the >> "tracking remote" message. > > So what you a

Re: feature request: add -q to "git branch"

2017-02-06 Thread Kevin Layer
I think I got my git versions (old and new) mixed up. Sorry for the noise. On Sat, Feb 4, 2017 at 1:17 PM, Pranit Bauva wrote: > Hey Kevin, > > Sorry for the previous message. > > On Sun, Feb 5, 2017 at 2:47 AM, Pranit Bauva wrote: >> Hey Kevin, >> >> On Fr

Re: Bug in 'git describe' if I have two tags on the same commit.

2017-02-13 Thread Kevin Daudt
On Sun, Feb 12, 2017 at 01:15:22PM +0100, Istvan Pato wrote: > I didn't get back the latest tag by 'git describe --tags --always' if > I have two tags on the same commit. > > // repository ppa:git-core/ppa > > (master)⚡ % cat /etc/lsb-release > DISTRIB_ID=Ubuntu > DISTRIB_RELEASE=16.04 > DISTRIB_

Re: [PATCH 1/3] add QSORT

2016-10-05 Thread Kevin Bracey
ff. But, as long as you are confident you never invoke that line without a program bug - ie an API precondition of your own QSORT is that NULL is legal iff nmemb is zero, then I guess it's fine. Behaviour is defined, as long as you don't violate your internal preconditions. Kevin

Re: Setting pager.add=true breaks add --patch

2016-10-05 Thread Kevin Daudt
On Thu, Oct 06, 2016 at 10:55:11AM +0700, Tom Hale wrote: > On 2016-10-03 00:00, Anatoly Borodin wrote: > > I've reported this one bug recently: > > > > https://public-inbox.org/git/nrmbrl$hsk$1...@blaine.gmane.org/ > > > > The developers know about it, but it will require some deeper refactoring

Re: What's cooking in git.git (Oct 2016, #02; Thu, 6)

2016-10-06 Thread Kevin Daudt
On Thu, Oct 06, 2016 at 03:24:17PM -0700, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration branche

Re: What's cooking in git.git (Oct 2016, #02; Thu, 6)

2016-10-07 Thread Kevin Daudt
On Fri, Oct 07, 2016 at 09:40:01AM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > Just wondering why the topic "kd/mailinfo-quoted-string (2016-09-28) 2 > > commits" is not listed anymore. Previous what's cooking said it was > > merged to &q

Re: Bug? git worktree fails with master on bare repo

2016-10-08 Thread Kevin Daudt
On Sat, Oct 08, 2016 at 07:30:36PM -0500, Michael Tutty wrote: > Hey all, > I'm working on some server-side software to do a merge. By using git > worktree it's possible to check out a given branch for a bare repo and > merge another branch into it. It's very fast, even with large > repositories. >

Re: Bug? git worktree fails with master on bare repo

2016-10-11 Thread Kevin Daudt
On Mon, Oct 10, 2016 at 08:06:47AM -0500, Michael Tutty wrote: > > > If source repo's HEAD is "master", I got the same behavior (worktree add > > fails) > > So if it's possible for a bare repo to have HEAD pointing at master, > is there a safe way for me to change this (e.g., as a cleanup step >

Re: Formatting problem send_mail in version 2.10.0

2016-10-13 Thread Kevin Daudt
On Wed, Oct 12, 2016 at 07:13:22PM -0400, Jeff King wrote: > On Wed, Oct 12, 2016 at 01:53:52PM -0700, Junio C Hamano wrote: > > > Matthieu Moy writes: > > > > >>> If it's not in the body of the message, then where is it? > > >> > > >> This point is clarified in the thread > > >> http://marc.inf

Re: git branches & merge

2016-10-13 Thread Kevin Daudt
master side of the change, resulting the new IP to show up. Hope this helps, Kevin.

Re: Uninitialized submodules as symlinks

2016-10-13 Thread Kevin Daudt
On Thu, Oct 13, 2016 at 06:10:17PM +0200, Heiko Voigt wrote: > On Fri, Oct 07, 2016 at 06:17:05PM +, David Turner wrote: > > Presently, uninitialized submodules are materialized in the working > > tree as empty directories. We would like to consider having them be > > symlinks. Specifically,

Re: Automagic `git checkout branchname` mysteriously fails

2016-10-14 Thread Kevin Daudt
On Fri, Oct 14, 2016 at 04:25:49PM -0400, Martin Langhoff wrote: > In a (private) repo project I have, I recently tried (and failed) to do: > > git checkout v4.1-support > > getting a "pathspec did not match any files known to git" error. > > There's an origin/v4.1-support, there is no v4.1-su

Re: [ANNOUNCE] git-log-compact v1.0

2016-10-20 Thread Kevin Daudt
On Wed, Oct 19, 2016 at 05:13:34PM -0700, Kyle J. McKay wrote: > > The project page with detailed help and many screen shots is located at: > > https://mackyle.github.io/git-log-compact/ > > Alternatively the repository can be cloned from: > > https://github.com/mackyle/git-log-compact.git

How can I tell, from a script, if “git cherry-pick” fails?

2016-11-02 Thread Kevin Layer
If the cherry-pick fails due to a merge conflict, it just returns an exit status of 0. I have a script that does a series of cherry-picks and I need to know if they succeed. I'm sure this has been covered before. Using git version 1.8.3.1. Thank you. Kevin

Re: How can I tell, from a script, if “git cherry-pick” fails?

2016-11-02 Thread Kevin Layer
Nevermind. It's working as it should. The script that was doing the cherry-pick was doing it in an if and I neglected to exit with a non-zero status. Sorry for the noise. On Wed, Nov 2, 2016 at 8:14 AM, Kevin Layer wrote: > If the cherry-pick fails due to a merge conflict, it just re

Re: "git add -p ." raises an unexpected "warning: empty strings as pathspecs will be made invalid in upcoming releases. please use . instead if you meant to match all paths"

2016-11-30 Thread Kevin Daudt
On Wed, Nov 30, 2016 at 12:31:49PM -0800, Peter Urda wrote: > After upgrading to version 2.11.0 I am getting a warning about empty > strings as pathspecs while using 'patch' > > - Ran 'git add -p .' from the root of my git repository. > > - I was able to normally stage my changes, but was present

log: range_set_append: Assertion failed with -L:funcname:

2016-12-13 Thread Kevin Locke
.) I was able to reproduce the error with git built from 13b8f6 (the commit which introduced git log -L:pattern:file) as well as current next (91ed5b). The backtrace from next is attached. Any assistance to avoid or fix the error would be greatly appreciated. Thanks, Kevin P.S. Please CC me i

[PATCH 1/2] Resumable clone: create git-prime-clone (Draft)

2016-05-18 Thread Kevin Wern
Create a bare-bones version of git-prime-clone, which returns the location of an alternate resource specified by the server that the client should fetch and build before returning to perform an incremental fetch. At this point, no validation is performed of the file's existence, the file's validit

[PATCH 2/2] Resumable clone: add endpoints for prime clone (Draft)

2016-05-18 Thread Kevin Wern
Add endpoints for prime-clone in http service and git daemon --- daemon.c | 7 +++ http-backend.c | 1 + 2 files changed, 8 insertions(+) diff --git a/daemon.c b/daemon.c index 8d45c33..2ddc7f7 100644 --- a/daemon.c +++ b/daemon.c @@ -475,10 +475,17 @@ static int receive_pack(void)

[PATCH 0/2] git-prime-clone

2016-05-18 Thread Kevin Wern
esign considerations I missed, and I want to keep this as easily extensible to the other types as possible. Apologies for not keeping everyone in the loop. I should be working on this more actively from this point onwards. -Kevin Wern -- [PATCH 1/2] Resumable clone: create git-prime-clone (

BowlerStudio: using GIT as a file system for distributed robots

2016-05-20 Thread Kevin Harrington
I have spent the past year building an new open source robotics development platform and wanted to show you fine folks working on Git: BowlerStudio: https://github.com/NeuronRobotics/BowlerStudio I started working a set of robotics control libraries back in 2009 and have deployed them as the cont

Re: Notation for current branch?

2016-08-28 Thread Kevin Daudt
On Sun, Aug 28, 2016 at 05:58:18PM +0800, ryenus wrote: > I wonder if there's an easy to use notation to refer to the current branch? > which is expected be friendly to scripting. > > For HEAD, there's @, which is short and concise. > > But for the current branch, it seems one has to either use a

Re: [PATCH 01/34] sequencer: support a new action: 'interactive rebase'

2016-09-02 Thread Kevin Daudt
On Wed, Aug 31, 2016 at 10:54:02AM +0200, Johannes Schindelin wrote: > @@ -43,16 +51,20 @@ static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, > "rebase-merge/gpg_sign_opt") > /* We will introduce the 'interactive rebase' mode later */ > static inline int is_rebase_i(const struct replay_opts *opts) >

Re: Why patch is not showed at log?

2016-09-07 Thread Kevin Daudt
se git log --patch to include the diff. If not, could you please explain what you mean? Kevin

Re: Diff impromements: keep block whole

2016-09-12 Thread Kevin Daudt
redo PROCESS; > } > Yes, it would definately be more meaningfull, but for an algorithm it's not that clear cut. Michael Hagerty is currently working on a patch series[1] to give git some heuristics to get better diffs, but is hard to get right. You can already ena

Potential Same Name Bug

2016-09-12 Thread Kevin Smith
I hit an issue in Git today that seemed to be a bug. Basically what happened is in our master branch we had two files, one named something like "file_NAME.png" and another named "file_name.png" in the same folder. In the develop branch in the same repo we had removed the "file_NAME.png" file so t

Re: [ANNOUNCE] Git User's Survey 2016

2016-09-13 Thread Kevin Daudt
On Mon, Sep 12, 2016 at 09:51:09PM +0200, Jakub Narębski wrote: > Hello all, > > > P.P.S. Different announcements use different URLs (different channels) > to better track where one got information about this survey. > > Thanks in advance for taking time to answer the survey, Can we get a chan

Re: [ANNOUNCE] Git User's Survey 2016

2016-09-13 Thread Kevin Daudt
On Tue, Sep 13, 2016 at 03:52:28PM +0200, Jakub Narębski wrote: > Hello Kevin, > > On 13 September 2016 at 15:32, Kevin Daudt wrote: > > On Mon, Sep 12, 2016 at 09:51:09PM +0200, Jakub Narębski wrote: > > >> > >> P.P.S. Different announcements use differe

[RFC 0/1] de-quote quoted-strings in mailinfo

2016-09-13 Thread Kevin Daudt
). According to the RFC, comments can also appear in square brackets in the e-mail domain, but that has not been implemented. In fact, just like other functions, it just looks at the whole header line. Please let me know what you think. Kevin Daudt (1): mailinfo: de-quote quoted-pair in header

[RFC 0/1] mailinfo: de-quote quoted-pair in header fields

2016-09-13 Thread Kevin Daudt
. Signed-off-by: Kevin Daudt --- mailinfo.c | 46 ++ t/t5100-mailinfo.sh| 5 + t/t5100/quoted-pair.expect | 5 + t/t5100/quoted-pair.in | 9 + t/t5100/quoted-pair.info | 5 + 5 files changed, 70

[RFC 0/1] de-quote quoted-strings in mailinfo

2016-09-13 Thread Kevin Daudt
). According to the RFC, comments can also appear in square brackets in the e-mail domain, but that has not been implemented. In fact, just like other functions, it just looks at the whole header line. Please let me know what you think. Kevin Daudt (1): mailinfo: de-quote quoted-pair in header

Re: [RFC 0/1] mailinfo: de-quote quoted-pair in header fields

2016-09-13 Thread Kevin Daudt
On Tue, Sep 13, 2016 at 05:04:45PM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > It often is easier to read if smaller of the two are in the if part > and the larger in else part. Also your switch/case is indented one > level too deep. I.e. > Thanks, I'

Re: [RFC 0/1] mailinfo: de-quote quoted-pair in header fields

2016-09-14 Thread Kevin Daudt
On Tue, Sep 13, 2016 at 10:54:47PM -0700, Junio C Hamano wrote: > Jeff King writes: > > > It has been a while since I looked at rfc2822, but aren't the quoting > > and syntax rules different for addresses versus other headers? We would > > not want to dequote a Subject header, I think. > > You'r

Re: [RFC 0/1] mailinfo: de-quote quoted-pair in header fields

2016-09-14 Thread Kevin Daudt
On Wed, Sep 14, 2016 at 12:38:20PM -0700, Jeff King wrote: > On Wed, Sep 14, 2016 at 12:30:06PM -0700, Junio C Hamano wrote: > > > Another small thing I am not sure about is if the \ quoting can hide > > an embedded newline in the author name. Would we end up turning > > > > From: "Jeff \ >

[PATCH 01/11] Resumable clone: create service git-prime-clone

2016-09-15 Thread Kevin Wern
am to BINDIR_PROGRAMS_NEED_X, in addition to the usual builtin places. Add git-prime-clone executable to gitignore, as well Signed-off-by: Kevin Wern --- .gitignore| 1 + Documentation/git-prime-clone.txt | 39 Makefile | 2 + buil

[PATCH 02/11] Resumable clone: add prime-clone endpoints

2016-09-15 Thread Kevin Wern
Add logic to serve git-prime-clone to git and http clients. Do not pass --stateless-rpc and --advertise-refs options to prime-clone. It is inherently stateless and an 'advertisement'. Signed-off-by: Kevin Wern --- Documentation/git-daemon.txt | 7 +++ Documentatio

[PATCH 03/11] pkt-line: create gentle packet_read_line functions

2016-09-15 Thread Kevin Wern
Create a functions that can read malformed messages without dying. Includes creation of flag PACKET_READ_GENTLE_ALL. For use handling prime-clone (or other server error) responses. Signed-off-by: Kevin Wern --- pkt-line.c | 47 ++- pkt-line.h | 16

[PATCH 04/11] Resumable clone: add prime-clone to remote-curl

2016-09-15 Thread Kevin Wern
case. Signed-off-by: Kevin Wern --- remote-curl.c | 165 ++ 1 file changed, 121 insertions(+), 44 deletions(-) diff --git a/remote-curl.c b/remote-curl.c index 15e48e2..8ebb587 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -13,6 +13,8

[PATCH 00/11] Resumable clone

2016-09-15 Thread Kevin Wern
e been actively working on, but I'm hitting a point where keeping everyone up-to-date trumps completeness. Hopefully, the bulk of the 'learning and re-doing' is done and I can update more frequently in smaller increments. I will probably work on the git-daemon download service,

[PATCH 10/11] run command: add RUN_COMMAND_NO_STDOUT

2016-09-15 Thread Kevin Wern
Add option RUN_COMMAND_NO_STDOUT, which sets no_stdout on a child process. This will be used by git clone when calling index-pack on a downloaded packfile. Signed-off-by: Kevin Wern --- run-command.c | 1 + run-command.h | 1 + 2 files changed, 2 insertions(+) diff --git a/run-command.c b/run

[PATCH 06/11] Resumable clone: implement transport_prime_clone

2016-09-15 Thread Kevin Wern
verbosely. Therefore, all error parsing is done with remote-curl, and any protocol breach between remote-curl and transport-helper will treated as a bug and result in death. Signed-off-by: Kevin Wern --- transport-helper.c | 51 ++- transport.c

[PATCH 07/11] Resumable clone: add resumable download to http/curl

2016-09-15 Thread Kevin Wern
ll be downloaded to. The url passed to remote-curl on invocation does not matter (git clone will use the resource url again here). Signed-off-by: Kevin Wern --- http.c| 86 ++- http.h| 7 - remote-curl.c | 27 +

[PATCH 11/11] Resumable clone: implement primer logic in git-clone

2016-09-15 Thread Kevin Wern
, and leaving a resumable directory on exit--the logic for when to do these still needs more work. Signed-off-by: Kevin Wern --- Documentation/git-clone.txt | 16 ++ builtin/clone.c | 590 +--- t/t9904-git-prime-clone.sh | 181 +++

[PATCH 09/11] path: add resumable marker

2016-09-15 Thread Kevin Wern
Create function to get gitdir file RESUMABLE. Signed-off-by: Kevin Wern --- cache.h | 1 + path.c | 1 + 2 files changed, 2 insertions(+) diff --git a/cache.h b/cache.h index d7ff46e..1f4117c 100644 --- a/cache.h +++ b/cache.h @@ -811,6 +811,7 @@ const char *git_path_merge_mode(void); const

[PATCH 05/11] Resumable clone: add output parsing to connect.c

2016-09-15 Thread Kevin Wern
Add method for transport to call when parsing primeclone output from stdin. Suppress stderr when using git_connect with ssh, unless output is verbose. Signed-off-by: Kevin Wern --- connect.c | 47 +++ connect.h | 10 ++ 2 files changed, 53

[PATCH 08/11] Resumable clone: create transport_download_primer

2016-09-15 Thread Kevin Wern
Create function transport_download_primer and components to invoke and pass commands to remote-curl. Signed-off-by: Kevin Wern --- transport-helper.c | 24 transport.c| 9 + transport.h| 7 +++ 3 files changed, 40 insertions(+) diff --git

[PATCH] mailinfo: unescape quoted-pair in header fields

2016-09-16 Thread Kevin Daudt
characters from the author so that they don't show up in the commits author field. Signed-off-by: Kevin Daudt --- The only thing I could not easily fix is the prevent git am from removing any quotes around the author. This is done in fmt_ident, which calls `strbuf_addstr_without_crud`. maili

Re: [PATCH] mailinfo: unescape quoted-pair in header fields

2016-09-19 Thread Kevin Daudt
Thanks for the review On Fri, Sep 16, 2016 at 03:22:06PM -0700, Jeff King wrote: > On Fri, Sep 16, 2016 at 11:02:04PM +0200, Kevin Daudt wrote: > > > mailinfo.c | 54 > > ++ > > t/t5100-mailinfo.sh

[PATCH v2 2/2] mailinfo: unescape quoted-pair in header fields

2016-09-19 Thread Kevin Daudt
don't show up in the author field. Signed-off-by: Kevin Daudt --- mailinfo.c | 46 t/t5100-mailinfo.sh | 14 ++ t/t5100/comment.expect | 5 + t/t5100/comment.in | 9 + t/t5100/q

[PATCH v2 0/2] Handle escape characters in From field.

2016-09-19 Thread Kevin Daudt
Changes since v2: - detach from input parameter to reuse it as an output buffer - don't return error when encountering another open bracket in a comment - test escaping in comments Kevin Daudt (2): t5100-mailinfo: replace common path prefix with variable mailinfo: unescape quoted-pa

[PATCH v2 1/2] t5100-mailinfo: replace common path prefix with variable

2016-09-19 Thread Kevin Daudt
Many tests need to store data in a file, and repeat the same pattern to refer to that path: "$TEST_DATA"/t5100/ Create a variable that contains this path, and use that instead. Signed-off-by: Kevin Daudt --- t/t5100-mailinfo.sh | 56 +++---

Re: What's cooking in git.git (Sep 2016, #05; Mon, 19)

2016-09-21 Thread Kevin Daudt
On Mon, Sep 19, 2016 at 04:30:34PM -0700, Junio C Hamano wrote: > > * kd/mailinfo-quoted-string (2016-09-19) 2 commits > - mailinfo: unescape quoted-pair in header fields > - t5100-mailinfo: replace common path prefix with variable Is this good enough, or do you want me to look into the feedbac

Re: What's cooking in git.git (Sep 2016, #05; Mon, 19)

2016-09-21 Thread Kevin Daudt
On Wed, Sep 21, 2016 at 10:36:57AM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > On Mon, Sep 19, 2016 at 04:30:34PM -0700, Junio C Hamano wrote: > >> > >> * kd/mailinfo-quoted-string (2016-09-19) 2 commits > >> - mailinfo: unescape quoted-pair

Re: .gitignore does not ignore Makefile

2016-09-22 Thread Kevin Daudt
dvise tricks like `git update-index --assume-unchanges `, but this does not work as expected. It's merely a promise to git that this file does not change (and hence, git will not check if this file has changed when doing git status), but command that try to change this file will abort saying that the file has changed. Hope this helps, Kevin.

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-22 Thread Kevin Daudt
On Thu, Sep 22, 2016 at 07:33:11PM +, Anatoly Borodin wrote: > Hi Stefan, > > this section was added to the manual in the commit > cddb42d2c58a9de9b2b5ef68817778e7afaace3e by "Jonathan Nieder" > 6 years ago. Maybe he remembers better? > Just to make it clear, this section explicitly talks a

  1   2   3   4   5   >