Re: git log --graph --oneline issues (very small edge case)

2014-12-19 Thread Junio C Hamano
"Jason Pyeron" writes: > When a repo has multiple initial commits, the oneline graph can get borked. > > It will put a commit * with no parent directly above the next commit * > with no children. This gives the false impression that the two commits > are a sequence on a branch. Sounds vaguely fa

[PATCH] Bad file descriptor on filtering empty files

2014-12-19 Thread William Throwe
In git 2.2.0 (also tested on 2.2.0.65.g9abc44b), if an external smudge/clean filter is called on an empty file git reports something like: error: copy-fd: read returned Bad file descriptor error: cannot feed the input to external filter cat error: external filter cat failed Test case: mkdir bug c

Re: [PATCH v2 3/5] update_unicode.sh: shorten uniset invocation path

2014-12-19 Thread Torsten Bögershausen
> - ./uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD | > + uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD | (Technically both do the same) I personally think that using ./ it is extra obvious that a command is not from the path somewhere. But that may

Re: git-http-backend auth via Kerberos

2014-12-19 Thread Dan Langille (dalangil)
On Dec 19, 2014, at 3:16 PM, brian m. carlson wrote: > > On Fri, Dec 19, 2014 at 03:07:20PM +, Dan Langille (dalangil) wrote: >> Correct, we are trying to avoid that. In addition, there is only https, no >> http. > > I don't think HTTPS versus HTTP matters. I use Kerberos over HTTPS only

Re: git-http-backend auth via Kerberos

2014-12-19 Thread brian m. carlson
On Fri, Dec 19, 2014 at 03:07:20PM +, Dan Langille (dalangil) wrote: > Correct, we are trying to avoid that. In addition, there is only https, no > http. I don't think HTTPS versus HTTP matters. I use Kerberos over HTTPS only and it works fine. > To be clear, for the following tests, there

[PATCH 5/7] receive-pack: move execute_commands_non_atomic before execute_commands

2014-12-19 Thread Stefan Beller
This way we don't need to declare the function first and implement it later, but rather we put the implementation directly at the place where the function was declared. The reason I did not move it up in the first place is better readability of the diff as the execute_commands_non_atomic function

[PATCH 3/7] send-pack.c: add --atomic command line argument

2014-12-19 Thread Stefan Beller
From: Ronnie Sahlberg This adds support to send-pack to negotiate and use atomic pushes iff the server supports it. Atomic pushes are activated by a new command line flag --atomic. In order to do this we also need to change the semantics for send_pack() slightly. The existing send_pack() functio

[PATCH 7/7] t5543-atomic-push.sh: add basic tests for atomic pushes

2014-12-19 Thread Stefan Beller
This adds tests for the atomic push option. The first four tests check if the atomic option works in good conditions and the last three patches check if the atomic option prevents any change to be pushed if just one ref cannot be updated. Signed-off-by: Stefan Beller --- Notes: v6: the same

[PATCH 6/7] push.c: add an --atomic argument

2014-12-19 Thread Stefan Beller
From: Ronnie Sahlberg Add a command line argument to the git push command to request atomic pushes. Signed-off-by: Ronnie Sahlberg Signed-off-by: Stefan Beller --- Notes: Changes v1 -> v2 It's --atomic now! (dropping the -push) v2->v3: * s/atomic-push/atomic/

[PATCH 2/7] send-pack: Rename ref_update_to_be_sent to check_to_send_update

2014-12-19 Thread Stefan Beller
This renames ref_update_to_be_sent to check_to_send_update and inverts the meaning of the return value. Having the return value inverted we can have different values for the error codes. This is useful in a later patch when we want to know if we hit the CHECK_REF_STATUS_REJECTED case. Signed-off-b

[PATCH 1/7] receive-pack.c: add protocol support to negotiate atomic-push

2014-12-19 Thread Stefan Beller
From: Ronnie Sahlberg This adds support to the protocol between send-pack and receive-pack to * allow receive-pack to inform the client that it has atomic push capability * allow send-pack to request atomic push back. There is currently no setting in send-pack to actually request that atomic pus

[PATCH 4/7] receive-pack.c: receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-19 Thread Stefan Beller
Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a time update. This is to cause as little disruption as possible to existing clients. It is unknown if there are client scripts

[PATCHv6 0/7] atomic pushes

2014-12-19 Thread Stefan Beller
This patch series adds a flag to git push to update the remote refs atomically. This series applies on top of origin/mh/reflog-expire It can also be found at github[1]. This series incorporates all suggestions by Eric. Most changes appear in patch 4/7 as it is a complete rewrite compared to v5 of

Are simultaneous fetches safe?

2014-12-19 Thread Craig Silverstein
(Separated out from another thread since this issue seems more general.) I am planning to use 'git new-workdir', which basically lets several workspaces share a single .git/refs directory. (Among other dirs in .git) It's possible that I'll end up running 'git fetch' in these workspaces simultaneou

Gitk: "argument list too long"

2014-12-19 Thread Nicolas Pennequin (npennequ)
Hi, I¹m having some trouble with gitk on Mac using a very large repository (chromium/src). I¹m using git version 2.2.1 from Homebrew. The error details are the following: couldn't execute "git": argument list too long couldn't execute "git": argument list too long while executing "open [conc

[PATCH] refs.c: remove extern keyword from function definition

2014-12-19 Thread Ramsay Jones
Commit 5ed85684 ("reflog_expire(): new function in the reference API", 12-12-2014) added a new function definition which included the extern keyword. While this is not an illegal use of the keyword, it is somewhat unusual to include it in a function definition. (It would be unique in the git code

Re: [PATCH] remote: allow adding remote w same name as alias

2014-12-19 Thread Michael J Gruber
Anastas Dancha schrieb am 19.12.2014 um 16:44: > Hello Johannes, > > On Fri, Dec 19, 2014 at 4:37 AM, Johannes Schindelin > wrote: >> [...] >> There is one bit left to clarify: let me guess, you have a $HOME/.gitconfig >> like this: >> >> [url "anas...@company.com"] >> ins

git log --graph --oneline issues (very small edge case)

2014-12-19 Thread Jason Pyeron
When a repo has multiple initial commits, the oneline graph can get borked. It will put a commit * with no parent directly above the next commit * with no children. This gives the false impression that the two commits are a sequence on a branch. E.g: * xxx update of A (#0011) * xxx merg

[PATCH v2 5/5] update_unicode.sh: Delete the command group

2014-12-19 Thread dev+git
From: Beat Bolli Now that the whole file is generated by one single command, the command group is no longer needed. Signed-off-by: Beat Bolli --- update_unicode.sh | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/update_unicode.sh b/update_unicode.s

[PATCH v2 4/5] update_unicode.sh: Make the output structure visible

2014-12-19 Thread dev+git
From: Beat Bolli By using a here document instead of the echo/uniset sequence, the final structure of the generated file becomes obvious. Signed-off-by: Beat Bolli --- update_unicode.sh | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/update_unicode.sh b/upd

[PATCH v2 2/5] update_unicode.sh: set UNICODE_DIR only once

2014-12-19 Thread dev+git
From: Beat Bolli The value is the same on both uniset invocations, so "Don't Repeat Yourself" applies. Since we're in a subshell already, there's no need to unset UNICODE_DIR at the end. Signed-off-by: Beat Bolli --- update_unicode.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

[PATCH v2 1/5] update_unicode.sh: simplify output capture

2014-12-19 Thread dev+git
From: Beat Bolli Instead of capturing the output of each echo and uniset invocation, wrap the whole section in a group command and redirect its output all at once. Signed-off-by: Beat Bolli --- update_unicode.sh | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --gi

[PATCH v2 3/5] update_unicode.sh: shorten uniset invocation path

2014-12-19 Thread dev+git
From: Beat Bolli "uniset/uniset" is a relative path; there's no need to prefix it with "./". Signed-off-by: Beat Bolli --- update_unicode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update_unicode.sh b/update_unicode.sh index bed8916..f5cc14b 100755 --- a/update_

[PATCH v2 4/5] update_unicode.sh: Make the output structure visible

2014-12-19 Thread dev+git
From: Beat Bolli By using a here document instead of the echo/uniset sequence, the final structure of the generated file becomes obvious. Signed-off-by: Beat Bolli --- update_unicode.sh | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/update_unicode.sh b/upd

[PATCH v2 2/5] update_unicode.sh: set UNICODE_DIR only once

2014-12-19 Thread dev+git
From: Beat Bolli The value is the same on both uniset invocations, so "Don't Repeat Yourself" applies. Since we're in a subshell already, there's no need to unset UNICODE_DIR at the end. Signed-off-by: Beat Bolli --- update_unicode.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

[PATCH v2 3/5] update_unicode.sh: shorten uniset invocation path

2014-12-19 Thread dev+git
From: Beat Bolli "uniset/uniset" is a relative path; there's no need to prefix it with "./". Signed-off-by: Beat Bolli --- update_unicode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update_unicode.sh b/update_unicode.sh index bed8916..f5cc14b 100755 --- a/update_

[PATCH v2 5/5] update_unicode.sh: Delete the command group

2014-12-19 Thread dev+git
From: Beat Bolli Now that the whole file is generated by one single command, the command group is no longer needed. Signed-off-by: Beat Bolli --- update_unicode.sh | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/update_unicode.sh b/update_unicode.s

[PATCH v2 1/5] update_unicode.sh: simplify output capture

2014-12-19 Thread dev+git
From: Beat Bolli Instead of capturing the output of each echo and uniset invocation, wrap the whole section in a group command and redirect its output all at once. Signed-off-by: Beat Bolli --- update_unicode.sh | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --gi

Re: Fix wrong catalan translation

2014-12-19 Thread Alex Henrie
2014-12-19 3:38 GMT-07:00 Albert Astals Cid : > Hi, i'm attaching a fix for the Catalan translation were it seems some > Spanish sneaked in. Hi Albert, thanks for your interest, and sorry for the error. I'm currently working with Joan Perals on a batch of corrections to the Catalan translation, in

Re: git-http-backend auth via Kerberos

2014-12-19 Thread Dan Langille (dalangil)
> On Dec 19, 2014, at 10:07 AM, Dan Langille (dalangil) > wrote: > >> You might also try specifying KrbMethodK5Passwd on explicitly. I don't >> happen to use that option (I use Kerberos to avoid passwords altogether) >> so that might work for you. >> >> I don't know what version of git you're

Re: git-http-backend auth via Kerberos

2014-12-19 Thread Dan Langille (dalangil)
> On Dec 19, 2014, at 10:07 AM, Dan Langille (dalangil) > wrote: > >> You might also try specifying KrbMethodK5Passwd on explicitly. I don't >> happen to use that option (I use Kerberos to avoid passwords altogether) >> so that might work for you. >> >> I don't know what version of git you're

Re: [PATCH 4/5] update_unicode.sh: Make the output structure visible

2014-12-19 Thread Jeff King
On Fri, Dec 19, 2014 at 04:43:51PM +0100, Beat Bolli wrote: > I think the code looks much nicer with a here doc. > > Checking in t/, it looks that there's no consensus about whether to > indent the content relative to the cat statement or not. What do you > suggest? I think we typically do it at

Re: [PATCH] remote: allow adding remote w same name as alias

2014-12-19 Thread Anastas Dancha
Hello Johannes, On Fri, Dec 19, 2014 at 4:37 AM, Johannes Schindelin wrote: > [...] > There is one bit left to clarify: let me guess, you have a $HOME/.gitconfig > like this: > > [url "anas...@company.com"] > insteadOf = backup > pushInsteadOf = backup > >

Re: [PATCH 4/5] update_unicode.sh: Make the output structure visible

2014-12-19 Thread Beat Bolli
On 19.12.14 16:22, Jeff King wrote: > On Fri, Dec 19, 2014 at 03:39:30PM +0100, dev+...@drbeat.li wrote: > >> By using printf instead of the echo/uniset sequence, the final structure >> of the generated file becomes obvious. > > This whole series looks pretty sane to me, and the result is easier

Re: [PATCH 4/5] update_unicode.sh: Make the output structure visible

2014-12-19 Thread Jeff King
On Fri, Dec 19, 2014 at 03:39:30PM +0100, dev+...@drbeat.li wrote: > By using printf instead of the echo/uniset sequence, the final structure > of the generated file becomes obvious. This whole series looks pretty sane to me, and the result is easier to read. I did wonder if a here-doc would be

Re: [PATCH 1/5] update_unicode.sh: simplify output capture

2014-12-19 Thread Beat Bolli
On 19.12.14 15:39, dev+...@drbeat.li wrote: > From: Beat Bolli Sorry, it looks like git send-email borked these messages. This line should be part of the mail headers. Regards, Beat Bolli -- https://drbeat.li pgp: 0x506A903A; 49D5 794A EA77 F907 764F D89E 304B 93CF 506A 903A gsm: 4.7.7.6.0.7

Re: git-http-backend auth via Kerberos

2014-12-19 Thread Dan Langille (dalangil)
> On Dec 18, 2014, at 5:54 PM, brian m. carlson > wrote: > > On Thu, Dec 18, 2014 at 10:19:19PM +, Dan Langille (dalangil) wrote: >> This is what happens without a valid ticket: >> >> $ git clone https://us.example.com/git/clamav-bytecode-compiler >> Cloning into 'clamav-bytecode-compiler'.

[PATCH 4/5] update_unicode.sh: Make the output structure visible

2014-12-19 Thread dev+git
From: Beat Bolli By using printf instead of the echo/uniset sequence, the final structure of the generated file becomes obvious. Signed-off-by: Beat Bolli --- update_unicode.sh | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/update_unicode.sh b/update_un

[PATCH 5/5] update_unicode.sh: Delete the command group

2014-12-19 Thread dev+git
From: Beat Bolli Now that the whole file is generated by one single command, the command group is no longer needed. Signed-off-by: Beat Bolli --- update_unicode.sh | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/update_unicode.sh b/update_unicode.sh index 6196

[PATCH 2/5] update_unicode.sh: set UNICODE_DIR only once

2014-12-19 Thread dev+git
From: Beat Bolli The value is the same on both uniset invocations, so "Don't Repeat Yourself" applies. Since we're in a subshell already, there's no need to unset UNICODE_DIR at the end. Signed-off-by: Beat Bolli --- update_unicode.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

[PATCH 3/5] update_unicode.sh: shorten uniset invocation path

2014-12-19 Thread dev+git
From: Beat Bolli "uniset/uniset" is a relative path; there's no need to prefix it with "./". Signed-off-by: Beat Bolli --- update_unicode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update_unicode.sh b/update_unicode.sh index bed8916..f5cc14b 100755 --- a/update_

[PATCH 1/5] update_unicode.sh: simplify output capture

2014-12-19 Thread dev+git
From: Beat Bolli Instead of capturing the output of each echo and uniset invocation, wrap the whole section in a group command and redirect its output all at once. Signed-off-by: Beat Bolli --- update_unicode.sh | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --gi

Fix wrong catalan translation

2014-12-19 Thread Albert Astals Cid
I'm not subscribed, please CC-me. Hi, i'm attaching a fix for the Catalan translation were it seems some Spanish sneaked in. Cheers, Albert P.S: Sending again since your list didn't like me sending this from @yahoo mail server From e8ae2db0d0f9736bd35d92a66fc46f59d762ad95 Mon Sep 17 00:00:00 2

Re: [PATCHv5 4/6] receive-pack.c: use a single ref_transaction for atomic pushes

2014-12-19 Thread Eric Sunshine
On Thu, Dec 18, 2014 at 7:22 PM, Stefan Beller wrote: > From: Ronnie Sahlberg > > Update receive-pack to use an atomic transaction iff the client negotiated > that it wanted atomic-push. This leaves the default behavior to be the old > non-atomic one ref at a time update. This is to cause as litt

[BUG] interactive rebase loses instruction sheet when aborting to avoid overwriting files

2014-12-19 Thread ydirson
[using v2.1.3] When using "rebase -i" and the working dir contains untracked files that are present in the new base, we correctly get a "would be overwritten by checkout" error, but then the whole rebase interrupts the (long) listing of the incriminated files in the middle of a line and termina

Re: [PATCH] remote: allow adding remote w same name as alias

2014-12-19 Thread Johannes Schindelin
Hi Anastas, On Tue, 16 Dec 2014, Anastas Dancha wrote: > Then I wrote "alias", I've meant the following: > ``` > [url "g...@githost.com"] > insteadOf = myalias > pushInsteadOf = myalias > ``` > Unfortunately, your suggested fix will not allow my [poorly] described > use case. There is one bit le

Re: [ANNOUNCE] Git v2.2.1 (and updates to older maintenance tracks)

2014-12-19 Thread Johannes Schindelin
Hi Max, On Fri, 19 Dec 2014, Max Kirillov wrote: > Hello. Thank you for the fix. You are welcome. > Would it be more reliable to compare inode of directory in question and > ".git"? (there is [*] for windows). So that any unspotted name > equivalence is prevented to cause any harm. > > *) > h

[PATCH 1/1] clean: typo fixed

2014-12-19 Thread Alexander Kuleshov
Signed-off-by: Alexander Kuleshov --- builtin/clean.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/clean.c b/builtin/clean.c index 7784676..7e7fdcf 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -321,7 +321,7 @@ static void print_highlight_menu_stuff(struct m