Re: Keep original author with git merge --squash?

2015-02-12 Thread David Glasser
On Thu, Feb 12, 2015 at 4:12 AM, Jeff King p...@peff.net wrote: On Thu, Feb 12, 2015 at 12:35:48PM +0100, Michael Haggerty wrote: I assume you are already munging in your editor the template provided by git commit after the squash? What would be really nice, IMHO, is if there was a way to

Re: Keep original author with git merge --squash?

2015-02-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Feb 11, 2015 at 09:21:04AM -0800, David Glasser wrote: (I'm not sure if this should be a flag to --squash or to commit. Maybe `git merge --squash`; `git commit --use-squashed-author`? Seems like it should be not too hard to implement; SQUASH_MSG is

Re: [PATCH v2 00/12] Allow reference values to be checked in a transaction

2015-02-12 Thread Junio C Hamano
Modulo minor nits, this round looks nicely done. -- 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: [PATCH 5/8] reflog: rearrange the manpage

2015-02-12 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: On 02/11/2015 12:42 AM, Stefan Beller wrote: On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: ---all:: - Instead of listing refs explicitly, prune all refs. +--stale-fix:: + This revamps the logic -- the

Re: [PATCH 6/8] reflog_expire(): ignore --updateref for symbolic references

2015-02-12 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: This is a pretty exotic usage. I can't think of any real-life use case for using --updateref together with a symbolic reference. In our entire code base, --updateref is only used a single time, in git-stash.sh, and that is always for refs/stash,

Re: [PATCH v2 06/12] commit: add tests of commit races

2015-02-12 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: diff --git a/t/t7516-commit-races.sh b/t/t7516-commit-races.sh new file mode 100755 index 000..08e6a6c --- /dev/null +++ b/t/t7516-commit-races.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +test_description='git commit races' +. ./test-lib.sh +

Re: Git GSoC 2015

2015-02-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: The beginnings of the Google Summer of Code deadlines are upon us again. Organization applications are due February 20th (next Friday). - Any thoughts on procedures or lessons learned from last year? Personally, I really liked the micro-project system

Re: [PATCH v2 06/12] commit: add tests of commit races

2015-02-12 Thread Stefan Beller
On Thu, Feb 12, 2015 at 3:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Committing involves the following steps: 1. Determine the current value of HEAD (if any). 2. Create the new commit object. 3. Update HEAD. Please note that step 2 can take arbitrarily long, because it might

Re: [PATCH 8/8] reflog_expire(): lock symbolic refs themselves, not their referent

2015-02-12 Thread Stefan Beller
On Thu, Feb 12, 2015 at 8:52 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 02/12/2015 12:25 AM, Stefan Beller wrote: On Wed, Feb 11, 2015 at 2:49 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty

Re: [PATCH 0/3] Win32: nanosecond-precision file times

2015-02-12 Thread Junio C Hamano
Karsten Blees karsten.bl...@gmail.com writes: This patch series was inspired by the problem that Git does not detect changed file content if st_size, st_mtime and st_ctime are unchanged. This was apparently caused by VSS2Git resetting mtime to a value in the past. [1] I believe (or rather

Re: [ANNOUNCE] Git Merge, April 8-9, Paris

2015-02-12 Thread Sebastian Schuberth
On 24.01.2015 00:37, Jeff King wrote: GitHub is organizing a Git-related conference to be held April 8-9, 2015, in Paris. Details here: http://git-merge.com/ The exact schedule is still being worked out, but there is going to be some dedicated time/space for Git (and libgit2 and JGit)

Re: [PATCH v2 10/12] ref_transaction_verify(): new function to check a reference's value

2015-02-12 Thread Stefan Beller
On Thu, Feb 12, 2015 at 3:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Reviewed-by: Stefan Beller sbel...@google.com -- 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: [PATCH v2 03/12] struct ref_update: move have_old into flags

2015-02-12 Thread Stefan Beller
On Thu, Feb 12, 2015 at 3:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: - int flags; /* REF_NODEREF? */ - int have_old; /* 1 if old_sha1 is valid, 0 otherwise */ + /* +* One or more of REF_HAVE_OLD, REF_NODEREF, +* REF_DELETING, and REF_IS_PRUNING: +

Re: [PATCH v2 03/12] struct ref_update: move have_old into flags

2015-02-12 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: On Thu, Feb 12, 2015 at 3:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: - int flags; /* REF_NODEREF? */ - int have_old; /* 1 if old_sha1 is valid, 0 otherwise */ + /* +* One or more of REF_HAVE_OLD, REF_NODEREF, +

Re: [PATCH 2/8] write_ref_sha1(): Move write elision test to callers

2015-02-12 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: write_ref_sha1() previously skipped the write if the reference already had the desired value, unless lock-force_write was set. Instead, perform that test at the callers. Two of the callers (in rename_ref()) unconditionally set force_write just

Re: [ANNOUNCE] Git Merge, April 8-9, Paris

2015-02-12 Thread Sebastian Schuberth
On 24.01.2015 00:37, Jeff King wrote: GitHub is organizing a Git-related conference to be held April 8-9, 2015, in Paris. Details here: http://git-merge.com/ The exact schedule is still being worked out, but there is going to be some dedicated time/space for Git (and libgit2 and JGit)

Re: git svn import failure : write .git/Git_svn_hash_BmjclS: Bad file descriptor

2015-02-12 Thread Eric Wong
Valery Yundin yuval...@gmail.com wrote: On 31 January 2015 at 13:51, Nico Schlömer nico.schloe...@gmail.com wrote: I tried the patch and I still get ``` [...] r100 = e2a9b5baa2cebb18591ecb04ff350410d52f36de (refs/remotes/git-svn) Unexpected result returned from git cat-file at

Re: [PATCH v2 07/12] commit: avoid race when creating orphan commits

2015-02-12 Thread Junio C Hamano
Good. -- 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

[PATCH v2 11/12] update_ref(): improve documentation

2015-02-12 Thread Michael Haggerty
Add a docstring for update_ref(), emphasizing its similarity to ref_transaction_update(). Rename its parameters to match those of ref_transaction_update(). Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Reviewed-by: Stefan Beller sbel...@google.com --- refs.c | 8 refs.h | 15

Re: [PATCH 7/8] reflog_expire(): never update a reference to null_sha1

2015-02-12 Thread Michael Haggerty
On 02/09/2015 09:55 PM, Eric Sunshine wrote: On Mon, Feb 9, 2015 at 4:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: [...] But we don't want the repository in an invalid state even temporarily, and we don't want leave an invalid state if other callers of git s/want/want to/ [...]

Re: Keep original author with git merge --squash?

2015-02-12 Thread Jeff King
On Wed, Feb 11, 2015 at 09:21:04AM -0800, David Glasser wrote: (I'm not sure if this should be a flag to --squash or to commit. Maybe `git merge --squash`; `git commit --use-squashed-author`? Seems like it should be not too hard to implement; SQUASH_MSG is pretty parseable. Or just a config

Re: [PATCH 3/8] lock_ref_sha1_basic(): do not set force_write for missing references

2015-02-12 Thread Michael Haggerty
On 02/11/2015 01:05 AM, Jeff King wrote: On Tue, Feb 10, 2015 at 03:24:47PM -0800, Stefan Beller wrote: On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: If a reference is missing, its SHA-1 will be null_sha1, which can't possibly match a new value that

Re: Keep original author with git merge --squash?

2015-02-12 Thread Jeff King
On Thu, Feb 12, 2015 at 12:35:48PM +0100, Michael Haggerty wrote: I assume you are already munging in your editor the template provided by git commit after the squash? What would be really nice, IMHO, is if there was a way to set the author during that edit (e.g., by moving one of the

Re: [PATCH 3/3] transport-helper: fix typo in error message when --signed is not supported

2015-02-12 Thread Mike Hommey
On Thu, Feb 12, 2015 at 07:10:01PM +0900, Mike Hommey wrote: Signed-off-by: Mike Hommey m...@glandium.org --- transport-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index c3868e4..b72fd4a 100644 ---

[PATCH v2 05/12] ref_transaction_delete(): remove have_old parameter

2015-02-12 Thread Michael Haggerty
Instead, verify the reference's old value if and only if old_sha1 is non-NULL. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Reviewed-by: Stefan Beller sbel...@google.com --- builtin/receive-pack.c | 3 +-- builtin/update-ref.c | 5 +++-- refs.c | 11 ++-

[PATCH v2 09/12] ref_transaction_delete(): check that old_sha1 is not null_sha1

2015-02-12 Thread Michael Haggerty
It makes no sense to delete a reference that is already known not to exist. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Reviewed-by: Stefan Beller sbel...@google.com --- refs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs.c b/refs.c index 3f78fac..9dd7932 100644 ---

[PATCH v2 08/12] ref_transaction_create(): check that new_sha1 is valid

2015-02-12 Thread Michael Haggerty
Creating a reference requires a new_sha1 that is not NULL and not null_sha1. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Reviewed-by: Stefan Beller sbel...@google.com --- refs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs.c b/refs.c index ddb8bca..3f78fac 100644 ---

[PATCH v2 07/12] commit: avoid race when creating orphan commits

2015-02-12 Thread Michael Haggerty
If HEAD doesn't point at anything during the initial check, then we should make sure that it *still* doesn't point at anything when we are ready to update the reference. Otherwise, another process might commit while we are working (e.g., while we are waiting for the user to edit the commit

[PATCH v2 10/12] ref_transaction_verify(): new function to check a reference's value

2015-02-12 Thread Michael Haggerty
If NULL is passed to ref_transaction_update()'s new_sha1 parameter, then just verify old_sha1 (under lock) without trying to change the new value of the reference. Use this functionality to add a new function ref_transaction_verify(), which checks the current value of the reference under lock but

[PATCH v2 01/12] refs: move REF_DELETING to refs.c

2015-02-12 Thread Michael Haggerty
It is only used internally now. Document it a little bit better, too. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Reviewed-by: Stefan Beller sbel...@google.com --- refs.c | 6 ++ refs.h | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/refs.c b/refs.c index

[PATCH v2 03/12] struct ref_update: move have_old into flags

2015-02-12 Thread Michael Haggerty
Instead of having a separate have_old field, record this boolean value as a bit in the flags field. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- refs.c | 45 - 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/refs.c b/refs.c

[PATCH v2 12/12] refs.h: Remove duplication in function docstrings

2015-02-12 Thread Michael Haggerty
Add more information to the comment introducing the four reference transaction update functions, so that each function's docstring doesn't have to repeat it. Add a pointer from the individual functions' docstrings to the introductory comment. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu

[PATCH v2 04/12] ref_transaction_update(): remove have_old parameter

2015-02-12 Thread Michael Haggerty
Instead, verify the reference's old value if and only if old_sha1 is non-NULL. ref_transaction_delete() will get the same treatment in a moment. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Reviewed-by: Stefan Beller sbel...@google.com --- branch.c | 5 +++--

[PATCH v2 00/12] Allow reference values to be checked in a transaction

2015-02-12 Thread Michael Haggerty
This is v2 of the patch series, with only minor changes from v1 [1]. Thanks to Stefan Beller and Junio for their feedback about v1. I think I have addressed all of the points that were raised. Changes since v1: * Rebased onto new upstream master (because it now includes the dependencies,

[PATCH v2 06/12] commit: add tests of commit races

2015-02-12 Thread Michael Haggerty
Committing involves the following steps: 1. Determine the current value of HEAD (if any). 2. Create the new commit object. 3. Update HEAD. Please note that step 2 can take arbitrarily long, because it might involve the user editing a commit message. If a second process sneaks in a commit during

[PATCH v2 02/12] refs: remove the gap in the REF_* constant values

2015-02-12 Thread Michael Haggerty
There is no reason to reserve a gap between the public and private flags values. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- refs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 5e6355c..4de1383 100644 --- a/refs.c +++ b/refs.c @@ -44,7

Re: Keep original author with git merge --squash?

2015-02-12 Thread Michael Haggerty
On 02/12/2015 10:28 AM, Jeff King wrote: On Wed, Feb 11, 2015 at 09:21:04AM -0800, David Glasser wrote: (I'm not sure if this should be a flag to --squash or to commit. Maybe `git merge --squash`; `git commit --use-squashed-author`? Seems like it should be not too hard to implement;

Re: Windows Bluescreen

2015-02-12 Thread Erik Friesen
I'd say this is related. http://sourceforge.net/p/mingw/bugs/2240/ There isn't much hope, that was filed months ago with no action. I suggest moving to another ssh library perhaps? Anyways, this is a windows git bug report, so it really needs to stay with mysgit in my opinion. I'd say it

Re: [PATCH 1/3] transport-helper: emit progress and verbosity options after asking for capabilities

2015-02-12 Thread Junio C Hamano
Mike Hommey m...@glandium.org writes: Currently, the progress and verbosity options are only emitted for the fetch and push commands, but they should also be emitted for other commands, such as import or export, and, why not, even list. Signed-off-by: Mike Hommey m...@glandium.org --- I

Re: Keep original author with git merge --squash?

2015-02-12 Thread Jeff King
On Thu, Feb 12, 2015 at 02:34:43PM -0800, Junio C Hamano wrote: I actually was hoping that this would extend to cases other than git merge --squash. When running git commit and: - You didn't use a more explicit method of specifying the authorship identity (--author, --date, -C, -c

Re: Keep original author with git merge --squash?

2015-02-12 Thread Junio C Hamano
David Glasser glas...@davidglasser.net writes: So to be concrete: What I'm proposing (and I'm excited to implement it!) is the following: When running git commit and: - You've fallen into the case where the message was read from SQUASH_MSG - You haven't used another method of specifying the

Re: [PATCH 0/3] Win32: nanosecond-precision file times

2015-02-12 Thread Karsten Blees
Am 12.02.2015 um 20:48 schrieb Junio C Hamano: Karsten Blees karsten.bl...@gmail.com writes: However, some users have expressed concerns that 'same size and mtime' [2] may theoretically happen by chance in daily operation. Hmph. Haven't we already accepted that it is not just may

Re: [PATCH 0/3] nd/multiple-work-trees updates

2015-02-12 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: These patches are on top of what's in 'pu'. They add --ignore-other-worktrees and make a note about current submodule support status. I don't think submodule support is ready yet even with Max Kirillov's series [1]. His 03/03 is already fixed in

Re: [PATCH 0/7] migrate api-strbuf.txt into strbuf.h

2015-02-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: This is a re-roll of this series: http://thread.gmane.org/gmane.comp.version-control.git/260922/focus=261374 from early December to move the strbuf documentation into the header file. And of course the elephant in the room is the other dozen or more

Re: Keep original author with git merge --squash?

2015-02-12 Thread David Glasser
On Thu, Feb 12, 2015 at 2:16 PM, David Glasser glas...@davidglasser.net wrote: - Before invoking prepare-commit-msg, all of the `Author:` lines found in SQUASH_MSG have the same value OK, and to be very specific: I'm just proposing literally the same text written after Author; using mailmap

Re: [ANNOUNCE] Git Merge, April 8-9, Paris

2015-02-12 Thread Sebastian Schuberth
On 24.01.2015 00:37, Jeff King wrote: GitHub is organizing a Git-related conference to be held April 8-9, 2015, in Paris. Details here: http://git-merge.com/ The exact schedule is still being worked out, but there is going to be some dedicated time/space for Git (and libgit2 and JGit)

Re: [PATCH 6/8] reflog_expire(): ignore --updateref for symbolic references

2015-02-12 Thread Jeff King
On Mon, Feb 09, 2015 at 10:12:42AM +0100, Michael Haggerty wrote: if (!(flags EXPIRE_REFLOGS_DRY_RUN)) { + /* + * It doesn't make sense to adjust a reference pointed + * to by a symbolic ref based on expiring entries in + * the

Re: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT

2015-02-12 Thread Junio C Hamano
So after discussing this one and queuing the resulting three-patch series jk/sanity that consists of the three patches: * jk/sanity (2015-01-27) 3 commits - test-lib.sh: set prerequisite SANITY by testing what we really need - tests: correct misuses of POSIXPERM - t/lib-httpd:

Re: [PATCH 3/3] transport-helper: fix typo in error message when --signed is not supported

2015-02-12 Thread Junio C Hamano
Good eyes. This one is a straight-forward bugfix for 0ea47f9d (signed push: teach smart-HTTP to pass git push --signed around, 2014-09-15); will queue directly to jc/push-cert branch and will merge to maintenance tracks independent from the other two. Thanks. -- To unsubscribe from this list:

Re: [PATCH] Geolocation support

2015-02-12 Thread Junio C Hamano
Alessandro Di Marco d...@ethzero.com writes: Junio C Hamano gits...@pobox.com writes: More importantly, adding non-essential stuff left and right will force third party Git reimplementations to pay attention to them and also will leave room for them to make mistakes when deciding what to

Re: [msysGit] Re: [PATCH 0/3] Win32: nanosecond-precision file times

2015-02-12 Thread Johannes Schindelin
Hi, On 2015-02-12 20:48, Junio C Hamano wrote: Karsten Blees karsten.bl...@gmail.com writes: This patch series was inspired by the problem that Git does not detect changed file content if st_size, st_mtime and st_ctime are unchanged. This was apparently caused by VSS2Git resetting mtime to

Re: [PATCH] stash: git stash create and git stash store added to git stash usage synopsys

2015-02-12 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Scott Schmit i.g...@comcast.net writes: Considering the man page says create store are intended for scripts and probably not the command you want to use, why would we want it in the synopsis? With the understanding that these are only for

t5570 trap use in start/stop_git_daemon

2015-02-12 Thread Randall S. Becker
On the NonStop port, we found that “trap” was causing an issue with test success for t5570. When start_git_daemon completes, the shell (ksh,bash) on this platform is sending a signal 0 that is being caught and acted on by the trap command within the start_git_daemon and stop_git_daemon functions.

Re: [PATCH] Geolocation support

2015-02-12 Thread Alessandro Di Marco
Junio C Hamano gits...@pobox.com writes: Ævar Arnfjörð Bjarmason ava...@gmail.com writes: We've already told clients for a long time to ignore fields they don't know about, Yes, but the reason that mechanism is there is not because we want to add random cruft Git does not have to know

Re: Keep original author with git merge --squash?

2015-02-12 Thread Junio C Hamano
David Glasser glas...@davidglasser.net writes: Well, using -c appears to override SQUASH_MSG entirely; it replaces the message as well as the author. Often I do want to make my own message based on all the messages provided by the submitter. (And typically the branch's tip is the least

Re: Keep original author with git merge --squash?

2015-02-12 Thread David Glasser
On Thu, Feb 12, 2015 at 1:23 PM, Junio C Hamano gits...@pobox.com wrote: David Glasser glas...@davidglasser.net writes: Well, using -c appears to override SQUASH_MSG entirely; it replaces the message as well as the author. Often I do want to make my own message based on all the messages

Re: [PATCH 0/3] Win32: nanosecond-precision file times

2015-02-12 Thread Junio C Hamano
Karsten Blees karsten.bl...@gmail.com writes: This is more about copying 'old' things around, which usually also copies mtime on Windows. E.g.: # create two files with slightly different mtime for i in {1..10}; do (echo v1 test); done for i in {1..10}; do (echo v2 test2); done #

Re: [PATCH 0/3] nd/multiple-work-trees updates

2015-02-12 Thread Jens Lehmann
Am 13.02.2015 um 11:57 schrieb Junio C Hamano: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: These patches are on top of what's in 'pu'. They add --ignore-other-worktrees and make a note about current submodule support status. I don't think submodule support is ready yet even with Max

Re: Keep original author with git merge --squash?

2015-02-12 Thread David Glasser
On Thu, Feb 12, 2015 at 4:17 PM, David Glasser glas...@davidglasser.net wrote: On Thu, Feb 12, 2015 at 2:34 PM, Junio C Hamano gits...@pobox.com wrote: David Glasser glas...@davidglasser.net writes: So to be concrete: What I'm proposing (and I'm excited to implement it!) is the following:

Re: [PATCH 3/3] Win32: implement nanosecond-precision file times

2015-02-12 Thread Thomas Braun
Am 12.02.2015 um 00:53 schrieb Karsten Blees: We no longer use any of MSVCRT's stat-functions, so there's no need to stick to a CRT-compatible 'struct stat' either. Define and use our own POSIX-2013-compatible 'struct stat' with nanosecond- precision file times. Signed-off-by: Karsten

Re: [PATCH 3/3] Win32: implement nanosecond-precision file times

2015-02-12 Thread Karsten Blees
Am 13.02.2015 um 00:15 schrieb Thomas Braun: Am 12.02.2015 um 00:53 schrieb Karsten Blees: diff --git a/config.mak.uname b/config.mak.uname index b64b63c..a18a4cc 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -346,7 +346,7 @@ ifeq ($(uname_S),Windows) NO_SVN_TESTS = YesPlease

Re: [PATCH 0/3] Win32: nanosecond-precision file times

2015-02-12 Thread Karsten Blees
Am 13.02.2015 um 00:38 schrieb Junio C Hamano: Karsten Blees karsten.bl...@gmail.com writes: This is more about copying 'old' things around, which usually also copies mtime on Windows. E.g.: # create two files with slightly different mtime for i in {1..10}; do (echo v1 test); done

Re: [PATCH 2/2] support for --no-relative and diff.relative

2015-02-12 Thread Junio C Hamano
These two patches * bp/diff-relative-config (2015-01-07) 2 commits - diff: teach diff.relative to give default to --relative=value - diff: teach --no-relative to override earlier --relative have been sitting in my Undecided pile, primarily because I am wary of touching a core

Re: Keep original author with git merge --squash?

2015-02-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: What happens if there is no Author: line in the output? I've been assuming that we would do what the current code does. git commit --amend for example internally remembers who the original author was and uses that, without paying any attention to the result from

Re: [PATCH] t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

2015-02-12 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Since it's really not very difficult or invasive to add support for the no- variants, here's a patch to do so: I am inclined to replace the tc/t9001-noxmailer topic that has been sitting on my Undecided pile with this patch and move it forward. *

Re: [PATCH 0/7] migrate api-strbuf.txt into strbuf.h

2015-02-12 Thread Jeff King
On Thu, Feb 12, 2015 at 03:01:18PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: This is a re-roll of this series: http://thread.gmane.org/gmane.comp.version-control.git/260922/focus=261374 from early December to move the strbuf documentation into the header file.

Re: [PATCH/RFC] doc: document error handling functions and conventions (Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf)

2015-02-12 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jeff King p...@peff.net writes: On Fri, Dec 05, 2014 at 10:00:05AM -0800, Junio C Hamano wrote: I am more worried about variable length part pushing the information that is given later out to the right, e.g. error: missing file '%s' prevents us from

Re: Keep original author with git merge --squash?

2015-02-12 Thread David Glasser
On Thu, Feb 12, 2015 at 2:34 PM, Junio C Hamano gits...@pobox.com wrote: David Glasser glas...@davidglasser.net writes: So to be concrete: What I'm proposing (and I'm excited to implement it!) is the following: When running git commit and: - You've fallen into the case where the message was

Git GSoC 2015

2015-02-12 Thread Jeff King
The beginnings of the Google Summer of Code deadlines are upon us again. Organization applications are due February 20th (next Friday). - Do we want to do it? - Who would like to volunteer to be the org admin? I would like for it not to be me again, but I can help walk anyone through

[PATCH 1/3] transport-helper: emit progress and verbosity options after asking for capabilities

2015-02-12 Thread Mike Hommey
Currently, the progress and verbosity options are only emitted for the fetch and push commands, but they should also be emitted for other commands, such as import or export, and, why not, even list. Signed-off-by: Mike Hommey m...@glandium.org --- transport-helper.c | 5 +++-- 1 file changed, 3

[PATCH 3/3] transport-helper: fix typo in error message when --signed is not supported

2015-02-12 Thread Mike Hommey
Signed-off-by: Mike Hommey m...@glandium.org --- transport-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index c3868e4..b72fd4a 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -861,7 +861,7 @@ static int

[PATCH 2/3] transport-helper: emit check-connectivity, cloning, and update-shallow options for import

2015-02-12 Thread Mike Hommey
The check-connectivity, cloning, and update-shallow options are currently only emitted for the fetch command but should also be emitted for the import command. Signed-off-by: Mike Hommey m...@glandium.org --- transport-helper.c | 20 ++-- 1 file changed, 10 insertions(+), 10

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

2015-02-12 Thread Sebastian Schuberth
Kevin kevin071586 at yahoo.com writes: that the CTRL+Arrow keys are not sending any unique sequences. These sequences are distinct and can be bound as I am describing when using the mintty.exe xterm terminal emulator. So why are they not working when I Note that mintty does not work

Re: Windows Bluescreen

2015-02-12 Thread Chris Packham
On Thu, Feb 12, 2015 at 1:33 AM, Erik Friesen e...@aercon.net wrote: Pushing over http and https are unaffected.. My linux nas died, so on rebuild I tried to do the ssh thing, and realized quite soon that things weren't right. As far as other uses of ssh, I don't know, I use putty

Re: [PATCH 0/3] nd/multiple-work-trees updates

2015-02-12 Thread Mark Levedahl
On 02/12/2015 06:51 PM, Jens Lehmann wrote: Am 13.02.2015 um 11:57 schrieb Junio C Hamano: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: These patches are on top of what's in 'pu'. They add --ignore-other-worktrees and make a note about current submodule support status. I don't think

[PATCH 1/2] transport-helper: ask the helper to set progress and verbosity options after asking for its capabilities

2015-02-12 Thread Mike Hommey
Currently, a remote helper is only told about the progress and verbosity options for the 'fetch' and 'push' commands. This means a remote helper that implements 'import' and 'export' can never know the user requested progress or verbosity (or lack thereof) through the command line. Telling the

[PATCH 2/2] transport-helper: ask the helper to set the same options for import as for fetch

2015-02-12 Thread Mike Hommey
A remote helper is currently only told about the 'check-connectivity', 'cloning', and 'update-shallow' options when it supports the 'fetch' command, but not when it supports 'import' instead. This is especially important for the 'cloning' option, because it means a remote helper that only

Re: Keep original author with git merge --squash?

2015-02-12 Thread David Glasser
On Thu, Feb 12, 2015 at 12:18 PM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: On Wed, Feb 11, 2015 at 09:21:04AM -0800, David Glasser wrote: (I'm not sure if this should be a flag to --squash or to commit. Maybe `git merge --squash`; `git commit

Re: t5570 trap use in start/stop_git_daemon

2015-02-12 Thread Jeff King
On Thu, Feb 12, 2015 at 03:31:12PM -0500, Randall S. Becker wrote: On the NonStop port, we found that “trap” was causing an issue with test success for t5570. When start_git_daemon completes, the shell (ksh,bash) on this platform is sending a signal 0 that is being caught and acted on by the

Re: Keep original author with git merge --squash?

2015-02-12 Thread Jeff King
On Thu, Feb 12, 2015 at 03:32:37PM -0800, Junio C Hamano wrote: and using Author: (with no text) does a reset. no (I do not think it is wrong per-se, but I do not think such a good idea). Fair enough. It is probably a minority use case, and one that is likely to cause confusion. Also,

Re: [msysGit] Re: Windows Bluescreen

2015-02-12 Thread Erik Friesen
Sorry, I don't know what this TOP posting problem is, and hitting reply only replies to the last sender. If you prefer, and you have some regular bugtracker, I could use that instead of email posting. To repro- Set up git user on local linux repo, in my case 192.168.0.100 On a windows 7 64bit

Re: Windows Bluescreen

2015-02-12 Thread Erik Friesen
Also, as another nuance of this bug, this destroyed the local repo in the process, inserting HEAD, , md5hashes, and doubling up on stuff everywhere. On Thu, Feb 12, 2015 at 7:21 AM, Erik Friesen e...@aercon.net wrote: I'd say this is related. http://sourceforge.net/p/mingw/bugs/2240/

RE: Windows Bluescreen

2015-02-12 Thread Jason Pyeron
-Original Message- From: Erik Friesen Sent: Thursday, February 12, 2015 7:22 I'd say this is related. http://sourceforge.net/p/mingw/bugs/2240/ There isn't much hope, that was filed months ago with no action. I suggest moving to another ssh library perhaps? Anyways, this is a

could not verify object error

2015-02-12 Thread Daniel Devlin
Hi there, I have been running: repo = Rugged::Config.global type = commit tagname = v99.99.2 username = repo[user.name] email = repo[user.email] message = this is the message for the annotated tag tag_contents = object f849f9e28c7f36a826d4b451efb16516c0c3acc2\ntype #{type}\ntag #

Re: [msysGit] Re: Windows Bluescreen

2015-02-12 Thread Thomas Braun
Am Donnerstag, den 12.02.2015, 07:21 -0500 schrieb Erik Friesen: I'd say this is related. http://sourceforge.net/p/mingw/bugs/2240/ There isn't much hope, that was filed months ago with no action. I suggest moving to another ssh library perhaps? Anyways, this is a windows git bug report,

Re: [PATCH 5/8] reflog: rearrange the manpage

2015-02-12 Thread Michael Haggerty
On 02/11/2015 12:42 AM, Stefan Beller wrote: On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: ---all:: - Instead of listing refs explicitly, prune all refs. +--stale-fix:: + This revamps the logic -- the definition of broken commit + becomes: a

Re: [PATCH] refs.c: get rid of force_write flag

2015-02-12 Thread Michael Haggerty
On 02/11/2015 12:12 AM, Stefan Beller wrote: Signed-off-by: Stefan Beller sbel...@google.com --- Notes: When this patch series is applied, you only have 3 occurences of force_write. 1. In the struct as an undocumented int. 2. In lock_ref_sha1_basic: if ((flags

Re: [PATCH 6/8] reflog_expire(): ignore --updateref for symbolic references

2015-02-12 Thread Michael Haggerty
On 02/11/2015 01:44 AM, Stefan Beller wrote: On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: If we are expiring reflog entries for a symbolic reference, then how should --updateref be handled if the newest reflog entry is expired? Option 1: Update the

Re: [PATCH 8/8] reflog_expire(): lock symbolic refs themselves, not their referent

2015-02-12 Thread Michael Haggerty
On 02/12/2015 12:25 AM, Stefan Beller wrote: On Wed, Feb 11, 2015 at 2:49 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: When processing the reflog of a symbolic ref, hold the

Re: [PATCH 6/8] reflog_expire(): ignore --updateref for symbolic references

2015-02-12 Thread Stefan Beller
On Thu, Feb 12, 2015 at 8:08 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 02/11/2015 01:44 AM, Stefan Beller wrote: On Mon, Feb 9, 2015 at 1:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: If we are expiring reflog entries for a symbolic reference, then how should --updateref be

Re: [PATCH v2 04/12] ref_transaction_update(): remove have_old parameter

2015-02-12 Thread Junio C Hamano
On Thu, Feb 12, 2015 at 3:12 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Instead, verify the reference's old value if and only if old_sha1 is non-NULL. ... @@ -3664,9 +3664,6 @@ int ref_transaction_update(struct ref_transaction *transaction, if (transaction-state !=