Re: [PATCH] Added get sendmail from .mailrc

2014-01-27 Thread Kyle J. McKay
On Jan 27, 2014, at 17:15, Jeff King wrote: On Sat, Jan 25, 2014 at 01:46:50PM +0400, Brilliantov Kirill Vladimirovich wrote: + if (!defined $smtp_server) { + my $mailrc = File::HomeDir->my_home . "/.mailrc"; Actually, based on the output of "man mail", this should proba

[PATCH] repack: add `repack.honorpackkeep` config var

2014-01-27 Thread Jeff King
On Thu, Jan 23, 2014 at 06:44:43PM -0800, Siddharth Agarwal wrote: > On 01/23/2014 06:28 PM, Jeff King wrote: > >I think your understanding is accurate here. So we want repack to > >respect keep files for deletion, but we _not_ necessarily want > >pack-objects to avoid packing an object just becau

[PATCH 2/2] handle_path_include: don't look at NULL value

2014-01-27 Thread Jeff King
When we see config like: [include] path the expand_user_path helper notices that the config value is empty, but we then dereference NULL while printing the error message (glibc will helpfully print "(null)" for us here, but we cannot rely on that). $ git -c include.path rev-parse error:

[PATCH 1/2] expand_user_path: do not look at NULL path

2014-01-27 Thread Jeff King
We explicitly check for and handle the case that the incoming "path" variable is NULL, but before doing so we call strchrnul on it, leading to a potential segfault. We can fix this simply by moving the strchrnul call down; as a bonus, we can tighten the scope on the associated variable. Signed-of

Re: [PATCH] Added get sendmail from .mailrc

2014-01-27 Thread Jeff King
On Sat, Jan 25, 2014 at 01:46:50PM +0400, Brilliantov Kirill Vladimirovich wrote: > + if (!defined $smtp_server) { > + my $mailrc = File::HomeDir->my_home . "/.mailrc"; The new module dependency has been discussed elsewhere in the thread. > + if (-e $mailrc) { > +

Re: [PATCH] Added get sendmail from .mailrc

2014-01-27 Thread Jeff King
On Sun, Jan 26, 2014 at 09:17:09AM +, Eric Wong wrote: > > > > +use File::HomeDir; > > > > > > We should probably avoid a new dependency and also remain consistent > > > with the rest of git handles home directories. > > > > > > Unfortunately, expand_user_path()/git_config_pathname() isn't c

Re: What's cooking in git.git (Jan 2014, #05; Mon, 27)

2014-01-27 Thread Jeff King
On Mon, Jan 27, 2014 at 02:09:52PM -0800, Junio C Hamano wrote: > [Stalled] > > * jk/color-for-more-pagers (2014-01-17) 4 commits > - pager: disable colors for some known-bad configurations > - DONOTMERGE: needs matching change to git-sh-setup > - setup_pager: set MORE=R > - setup_pager: refa

Re: [ANNOUNCE] Git v1.9-rc0

2014-01-27 Thread Jeff King
On Mon, Jan 27, 2014 at 02:56:28PM -0800, Junio C Hamano wrote: > > # replace this with however you store your oauth token > > # if you don't have one, make one here: > > # https://github.com/settings/tokens/new > > token() { > > pass -n github.web.oauth > > Hmph, what is this "pass" thing? It

Re: [PATCH v2 8/9] rebase: add the --gpg-sign option

2014-01-27 Thread brian m. carlson
On Mon, Jan 27, 2014 at 03:36:44PM -0800, Junio C Hamano wrote: > "brian m. carlson" writes: > > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > > index 43c19e0..73d32dd 100644 > > --- a/git-rebase--interactive.sh > > +++ b/git-rebase--interactive.sh > > @@ -181,7 +181,7

[PATCH] rev-parse: Check argc before using argv[i+1]

2014-01-27 Thread David Sharp
Without this patch, git-rev-parse --prefix, --default, or --resolve-git-dir, without a value argument, would result in a segfault. Instead, die() with a message. Signed-off-by: David Sharp --- builtin/rev-parse.c | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git

Re: [PATCH v2 3/3] diff: turn skip_stat_unmatch on selectively

2014-01-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > skip_stat_unmatch flag is added in fb13227 (git-diff: squelch "empty" > diffs - 2007-08-03) to ignore empty diffs caused by stat-only > dirtiness. In some diff case, stat is not involved at all. While > the code is written in a way that no expensive I/O is done, we

Re: [PATCH v2 8/9] rebase: add the --gpg-sign option

2014-01-27 Thread Junio C Hamano
"brian m. carlson" writes: > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 43c19e0..73d32dd 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -181,7 +181,7 @@ exit_with_patch () { > git rev-parse --verify HEAD > "$amend" >

Re: [PATCH v2 9/9] pull: add the --gpg-sign option.

2014-01-27 Thread Junio C Hamano
"brian m. carlson" writes: > git merge already allows us to sign commits, and git rebase has recently > learned how to do so as well. Teach git pull to parse the -S/--gpg-sign > option and pass this along to merge or rebase, as appropriate. > > Signed-off-by: brian m. carlson > --- > git-pull.

Re: [PATCH v2 4/9] am: add the --gpg-sign option

2014-01-27 Thread Junio C Hamano
"brian m. carlson" writes: > @@ -900,7 +906,8 @@ did you forget to use 'git add'?" > GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE" > export GIT_COMMITTER_DATE > fi && > - git commit-tree $tree ${parent:+-p} $parent > <"$dotest/final-c

Re: [PATCH v2 2/9] git-sh-setup.sh: add variable to use the stuck-long mode

2014-01-27 Thread Junio C Hamano
"brian m. carlson" writes: > From: Nicolas Vigier > > If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse > option parsing is done in --stuck-long mode. > > Signed-off-by: Nicolas Vigier > Signed-off-by: brian m. carlson > --- > contrib/examples/git-checkout.sh | 1 + > contrib/ex

Re: [ANNOUNCE] Git v1.9-rc0

2014-01-27 Thread Junio C Hamano
Jeff King writes: > On Thu, Jan 23, 2014 at 10:15:33AM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > Junio, since you prepare such tarballs[1] anyway for kernel.org, it >> > might be worth uploading them to the "Releases" page of git/git. I >> > imagine there is a programmatic wa

[PATCH v2 3/3] diff: turn skip_stat_unmatch on selectively

2014-01-27 Thread Nguyễn Thái Ngọc Duy
skip_stat_unmatch flag is added in fb13227 (git-diff: squelch "empty" diffs - 2007-08-03) to ignore empty diffs caused by stat-only dirtiness. In some diff case, stat is not involved at all. While the code is written in a way that no expensive I/O is done, we still need to move all file pairs from

Re: [PATCH v2 0/9] About the trailing slashes

2014-01-27 Thread Junio C Hamano
Thanks; will try to rebase on top of more recent codebase and then review. -- 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

What's cooking in git.git (Jan 2014, #05; Mon, 27)

2014-01-27 Thread Junio C Hamano
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 tip of 'master' is at 1.9-rc1; as far as new features are concerned, this is pretty much it until the final. On the maintenance track, we m

[ANNOUNCE] Git v1.9-rc1

2014-01-27 Thread Junio C Hamano
The first release candidate for this cycle, Git v1.9-rc1, is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: acc2343b4a0a0ed1920036fde1b1bf2109feb969 git-1.9.rc1.tar.gz 37bc0f5

Re: [PATCH 3/3] builtin/blame.c: large-scale rewrite

2014-01-27 Thread David Kastrup
Junio C Hamano writes: > David Kastrup writes: > >> Junio C Hamano writes: >> >>> David Kastrup writes: >>> The previous implementation uses a sorted linear list of struct blame_entry in a struct scoreboard for organizing all partial or completed work. Every task that is done r

Re: [PATCH v3 17/17] Documentation: add documentation for 'git interpret-trailers'

2014-01-27 Thread Junio C Hamano
Christian Couder writes: >>> +'git interpret-trailers' [--trim-empty] [--infile=file] >>> [...] >> >> Would it be more consistent with existing documentation to format this as so? >> >> [--infile=] [[=]]... > > No, it would be very inconsistent: > > $ grep '\.\.\.\]' *.txt | wc -l > 103 > $

Re: [PATCH v3 00/17] Add interpret-trailers builtin

2014-01-27 Thread Junio C Hamano
Is this from the same Christian? The series seems to have unusually high rate of style violations compared to the usual submission, like these: ERROR: open brace '{' following function declarations go on the next line #78: FILE: trailer.c:44: +static size_t alnum_len(const char *buf, size_t len)

Re: [PATCH 3/3] builtin/blame.c: large-scale rewrite

2014-01-27 Thread Junio C Hamano
David Kastrup writes: > Junio C Hamano writes: > >> David Kastrup writes: >> >>> The previous implementation uses a sorted linear list of struct >>> blame_entry in a struct scoreboard for organizing all partial or >>> completed work. Every task that is done requires going through the >>> whole

Re: [PATCH v3 17/17] Documentation: add documentation for 'git interpret-trailers'

2014-01-27 Thread Christian Couder
From: Eric Sunshine > > On Sun, Jan 26, 2014 at 12:00 PM, Christian Couder > wrote: >> Signed-off-by: Christian Couder >> --- >> diff --git a/Documentation/git-interpret-trailers.txt >> b/Documentation/git-interpret-trailers.txt >> new file mode 100644 >> index 000..f74843e >> --- /dev/null

[PATCH v2] repack.c: Use move_temp_to_file() instead of rename()

2014-01-27 Thread Torsten Bögershausen
In a1bbc6c0 a shell command "mv -f" was replaced with the rename() function. Use move_temp_to_file() from sha1_file.c instead of rename(). This is in line with the handling of other Git internal tmp files, and calls adjust_shared_perm() Signed-off-by: Torsten Bögershausen --- Thanks for all comm

Re: [PATCH 3/3] builtin/blame.c: large-scale rewrite

2014-01-27 Thread David Kastrup
Junio C Hamano writes: > David Kastrup writes: > >> The previous implementation uses a sorted linear list of struct >> blame_entry in a struct scoreboard for organizing all partial or >> completed work. Every task that is done requires going through the >> whole list where most entries are not

Re: [ANNOUNCE] Git v1.9-rc0

2014-01-27 Thread Jonathan Nieder
Hi, Kacper Kornet wrote: > The change in release numbering also breaks down gitolite v2 setups. One > of the gitolite commands, gl-compile-conf, expects the output of git > --version > to match /git version (\d+)\.(\d+)\.(\d+)/. > > I have no idea how big problem it is, as I don't know how man

Re: [ANNOUNCE] Git v1.9-rc0

2014-01-27 Thread Kacper Kornet
On Tue, Jan 21, 2014 at 02:14:22PM -0800, Junio C Hamano wrote: > It has been reported that turning git.rc into git.res does not like > the new 2-dewey-decimal release numbering scheme; packagers of > various distro might find similar issues in their build procedures, > in which case they have abou

Re: [PATCH v3 2/4] read-cache.c: Refactor --ignore-missing implementation

2014-01-27 Thread Junio C Hamano
Brad King writes: > Move lstat ENOENT handling from refresh_index to refresh_cache_ent and > activate it with a new CE_MATCH_IGNORE_MISSING option. This will allow > other call paths into refresh_cache_ent to use the feature. > > Signed-off-by: Brad King > --- Good! I forgot that we had "upda

Re: [PATCH] tree_entry_interesting: match against all pathspecs

2014-01-27 Thread Junio C Hamano
Duy Nguyen writes: > Ack. Perhaps this on top to verify it > > -- 8< -- > diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh > index af5134b..d9f37c3 100755 > --- a/t/t4010-diff-pathspec.sh > +++ b/t/t4010-diff-pathspec.sh > @@ -110,4 +110,17 @@ test_expect_success 'diff-tree -r wit

Re: [PATCH 3/3] builtin/blame.c: large-scale rewrite

2014-01-27 Thread Junio C Hamano
David Kastrup writes: > The previous implementation uses a sorted linear list of struct > blame_entry in a struct scoreboard for organizing all partial or > completed work. Every task that is done requires going through the > whole list where most entries are not relevant to the task at hand. >

Re: How to get notified of new releases?

2014-01-27 Thread Jonathan Nieder
Matthieu Moy wrote: > Robert Dailey wrote: >> Are there any dedicated mailing lists for git releases, or RSS feeds? > > Not sure if there's a Windows-dedicated list, but there's this: > > http://gitrss.q42.co.uk/ > > It filters the mailing-list posts starting with eg. [ANNOUNCE] and turns it >

Re: [PATCH v2 2/2] setup: Don't dereference in-tree symlinks for absolute paths

2014-01-27 Thread Junio C Hamano
Martin Erik Werner writes: > In order to manipulate symliks in the > work tree using absolute paths, symlinks should only be dereferenced > outside the work tree. I agree 100% with this reasoning (modulo s/symliks/symlinks/). As to the implementation, it looks a bit overly complicated, though.

Re: How to substructure rewrites?

2014-01-27 Thread David Kastrup
Junio C Hamano writes: > David Kastrup writes: > >> As it can easily be guessed, the "add xxx function" commits are >> basically adding not-yet-used code (and so will not disrupt >> compilation), but everything starting with "Reorganize blame data >> structures" up until the final commit will no

Re: [PATCH] doc: remote author/documentation sections from more pages

2014-01-27 Thread Junio C Hamano
Michael Haggerty writes: > On 01/27/2014 01:15 AM, Eric Sunshine wrote: >> On Sun, Jan 26, 2014 at 6:43 PM, Michael Haggerty >> wrote: >>> Subject: [PATCH] doc: remote author/documentation sections from more pages >> >> s/remote/remove/ > > Gaah! Git is a virus that invades your muscle memory

Re: [PATCH] send-email: If the ca path is not specified, use the defaults

2014-01-27 Thread Junio C Hamano
Ramkumar Ramachandra writes: > Junio C Hamano wrote: >> This change could introduce a regression for people on a platform >> whose certificate directory is /etc/ssl/certs but its IO::Socket:SSL >> somehow fails to use it as SSL_ca_path without being told. > > I can confirm that my git-send-email

Re: How to substructure rewrites?

2014-01-27 Thread Junio C Hamano
David Kastrup writes: > As it can easily be guessed, the "add xxx function" commits are > basically adding not-yet-used code (and so will not disrupt > compilation), but everything starting with "Reorganize blame data > structures" up until the final commit will not work or compile since the > co

[PATCH v3 1/4] t3030-merge-recursive: Test known breakage with empty work tree

2014-01-27 Thread Brad King
Sometimes when working with a large repository it can be useful to try out a merge and only check out conflicting files to disk (for example as a speed optimization on a server). Until v1.7.7-rc1~28^2~20 (merge-recursive: When we detect we can skip an update, actually skip it, 2011-08-11), it was

[PATCH v3 2/4] read-cache.c: Refactor --ignore-missing implementation

2014-01-27 Thread Brad King
Move lstat ENOENT handling from refresh_index to refresh_cache_ent and activate it with a new CE_MATCH_IGNORE_MISSING option. This will allow other call paths into refresh_cache_ent to use the feature. Signed-off-by: Brad King --- cache.h | 2 ++ read-cache.c | 8 +--- 2 files changed,

[PATCH v3 4/4] merge-recursive.c: Tolerate missing files while refreshing index

2014-01-27 Thread Brad King
Teach add_cacheinfo to tell make_cache_entry to skip refreshing stat information when a file is missing from the work tree. We do not want the index to be stat-dirty after the merge but also do not want to fail when a file happens to be missing. This fixes the 'merge-recursive w/ empty work tree

[PATCH v3 3/4] read-cache.c: Extend make_cache_entry refresh flag with options

2014-01-27 Thread Brad King
Convert the make_cache_entry boolean 'refresh' argument to a more general 'refresh_options' argument. Pass the value through to the underlying refresh_cache_ent call. Add option CE_MATCH_REFRESH to enable stat refresh. Update call sites to use the new signature. Signed-off-by: Brad King --- c

[PATCH v3 0/3] merge-recursive: Avoid diagnostic on empty work tree

2014-01-27 Thread Brad King
Hi Folks, Here is the third revision of this series. The previous revisions can be found at $gmane/241009 and $gmane/241030. Updates since the previous revision of the series: * Handling of lstat ENOENT has been moved down into refresh_cache_ent and activated by a new CE_MATCH_IGNORE_MISSING

Re: What's with git blame --reverse ?

2014-01-27 Thread Duy Nguyen
On Mon, Jan 27, 2014 at 7:45 PM, David Kastrup wrote: > > The git blame manual page talks about using git blame --reverse to > figure out when a particular change disappeared, but I cannot make it > produce anything useful regardless of what range I give it. Using > --root delivers a different st

What's with git blame --reverse ?

2014-01-27 Thread David Kastrup
The git blame manual page talks about using git blame --reverse to figure out when a particular change disappeared, but I cannot make it produce anything useful regardless of what range I give it. Using --root delivers a different state of uselessness. Can anyone give a recipe for using git blam

Re: How to get notified of new releases?

2014-01-27 Thread Thomas Hochstein
Robert Dailey schrieb: > Are there any dedicated mailing lists for git releases, or RSS feeds? > I am on Windows so I'd specifically be interested in notifications > when new releases or preview binaries are released on the Windows > platform. I'm constantly checking the website currently. You ma

Re: How to get notified of new releases?

2014-01-27 Thread Matthieu Moy
- Original Message - > Are there any dedicated mailing lists for git releases, or RSS feeds? Not sure if there's a Windows-dedicated list, but there's this: http://gitrss.q42.co.uk/ It filters the mailing-list posts starting with eg. [ANNOUNCE] and turns it into an RSS feed. -- Matt