Re: [PATCH] test-lint-duplicates: check numbering in contrib/remote-helpers

2013-04-02 Thread Eric Sunshine
On Tue, Apr 2, 2013 at 12:53 PM, Torsten Bögershausen tbo...@web.de wrote: Running make inside contrib/remote-helpers failes in test-lint-duplicates s/failes/fails/ This was because the regexp to check for duplicate numbers strips everything after the first - in the filename, including the

Re: [PATCH] glossary: extend detached HEAD description

2013-04-05 Thread Eric Sunshine
On Fri, Apr 5, 2013 at 11:19 AM, Junio C Hamano gits...@pobox.com wrote: Add a blanket description to the glossary to cover them instead. The general principle is that operations to update the branch work and affect on the HEAD, while operations to update the information s/work and affect on

Re: [PATCH] remote-hg: activate graplog extension for hg_log()

2013-04-06 Thread Eric Sunshine
On Sat, Apr 6, 2013 at 12:50 PM, Antoine Pelisse apeli...@gmail.com wrote: remote-hg: activate graplog extension for hg_log() s/graplog/graphlog/ The hg_log() test helper uses the --graph parameter that is implemented by the GraphLog extension. If the extension is not activated by the user,

Re: [PATCH] remote-helpers/test-bzr.sh: do not use grep \s

2013-04-07 Thread Eric Sunshine
On Sun, Apr 7, 2013 at 4:48 AM, Torsten Bögershausen tbo...@web.de wrote: Using grep devel\s\+3: to find at least one whitspace s/whitspace/whitespace/ is not portable on all grep versions: Not all grep versions understand \s as a whitespace. Use a literal TAB followed by SPACE like this [

Re: [PATCH 1/2] progress: create public humanize() to show sizes

2013-04-08 Thread Eric Sunshine
On Mon, Apr 8, 2013 at 2:18 PM, Antoine Pelisse apeli...@gmail.com wrote: Currently, humanization of downloaded size is done in the same function as text formatting. This is an issue if anyone else wants to use this. Separate text formatting from size simplification and make the function

Re: [PATCH v3 2/7] completion: get rid of empty COMPREPLY assignments

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: There's no functional reason for those, the only purpose they are supposed to serve is to say we don't provide any words here, but even for that it's not used consitently. s/consitently/consistently/

Re: [PATCH v3 5/7] completion: get rid of compgen

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: The functionality we use from compgen is not much, we can do the same manually, with drastical improvements in speed, specially when dealing s/drastical/drastic/ s/specially/especially/ with only a few words.

Re: [PATCH v3 6/7] completion: get rid of __gitcomp_1

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: There's no point in calling a separate function that is only used in one place. Specially considering that there's no need to call compgen, and s/Specially/Especially/ we traverse the words ourselves both in

Re: [PATCH v3 6/7] completion: get rid of __gitcomp_1

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 7:35 AM, John Keeping j...@keeping.me.uk wrote: On Wed, Apr 10, 2013 at 06:13:06AM -0400, Eric Sunshine wrote: On Wed, Apr 10, 2013 at 2:57 AM, Felipe Contreras felipe.contre...@gmail.com wrote: we traverse the words ourselves both in __gitcompadd, and __gitcomp_1. s

Re: [PATCH] archive: clarify explanation of --worktree-attributes

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 1:49 PM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Make it a bit clearer that --worktree-attributes is about files in the working tree (checked out files, possibly changed) and not the current working directory ($PDW). Link to the ATTRIBUTES section, which has

Re: [PATCH 1/2] transport-helper: report errors properly

2013-04-10 Thread Eric Sunshine
On Wed, Apr 10, 2013 at 5:15 PM, Jeff King p...@peff.net wrote: From: Felipe Contreras felipe.contre...@gmail.com If a push fails because the remote-helper died (with fast-export), the user does not see any error message. We do correctly die with a failed exit code, as we notice that the

Re: [PATCH] Various typofixes

2013-04-11 Thread Eric Sunshine
On Thu, Apr 11, 2013 at 4:55 PM, Stefano Lattarini stefano.lattar...@gmail.com wrote: Mostly suggested by codespell https://github.com/lucasdemarchi/codespell Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com --- diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c index

Re: [PATCH] i18n: make the translation of -u advise in one go

2013-04-11 Thread Eric Sunshine
On Thu, Apr 11, 2013 at 10:46 PM, Jiang Xin worldhello@gmail.com wrote: i18n: make the translation of -u advise in one go s/advise/advice/ The advise (consider use of -u when read_directory takes too long) is Ditto: s/advise/advice/ separated into 3 different status_printf_ln() calls,

Re: [PATCH 1/3] usage: refactor die-recursion checks

2013-04-15 Thread Eric Sunshine
On Mon, Apr 15, 2013 at 7:08 PM, Jeff King p...@peff.net wrote: This patch teaches die() to print the original die message to stderr before reporting the recursion. The custom die_routine may or may not have put it the message to s/put it the/emitted/ perhaps? stderr, but this is the best we

Re: What's cooking in git.git (Apr 2013, #05; Mon, 15)

2013-04-15 Thread Eric Sunshine
On Mon, Apr 15, 2013 at 8:30 PM, Jeff King p...@peff.net wrote: Subject: [PATCH] http: set curl FAILONERROR each time we select a handle Until commit 6d052d7 (http: add HTTP_KEEP_ERROR option, 2013-04-05), setting curl's FAILONERROR option was a global setup; we never changed it. However,

Re: [PATCH v3 2/2] submodule: drop the top-level requirement

2013-04-18 Thread Eric Sunshine
On Thu, Apr 18, 2013 at 3:50 PM, John Keeping j...@keeping.me.uk wrote: Use the new rev-parse --prefix option to process all paths given to the submodule command, dropping the requirement that it be run from the top-level of the repository. Signed-off-by: John Keeping j...@keeping.me.uk ---

Re: [PATCH v2 3/6] transport-helper: clarify pushing without refspecs

2013-04-18 Thread Eric Sunshine
On Thu, Apr 18, 2013 at 12:14 AM, Felipe Contreras felipe.contre...@gmail.com wrote: diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index cd1873c..3eeb309 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -111,13 +111,13 @@ test_expect_success

Re: [PATCH] cat-file: print tags raw for cat-file -p

2013-04-18 Thread Eric Sunshine
On Wed, Apr 17, 2013 at 5:00 PM, Jeff King p...@peff.net wrote: Subject: [PATCH] cat-file: print tags raw for cat-file -p When cat-file -p prints commits, it shows them in their raw format, since git's format is already human-readable. For tags, however, we print the whole thing raw except

Re: [PATCH] prompt: fix tracked files for zsh

2013-04-21 Thread Eric Sunshine
On Sun, Apr 21, 2013 at 4:11 AM, Felipe Contreras felipe.contre...@gmail.com wrote: When this option is enabled, the prompt gets totally screwed in zsh because all the codes start with % in zsh (like they are \ in bas). So s/bas/bash/ we need to escape the % character. Signed-off-by: Felipe

Re: [PATCH] zlib: fix compilation failures with Sun C Compilaer

2013-04-22 Thread Eric Sunshine
On Mon, Apr 22, 2013 at 12:18 PM, Stefano Lattarini stefano.lattar...@gmail.com wrote: zlib: fix compilation failures with Sun C Compilaer s/Compilaer/compiler/ Do this by removing a couple of useless return statements. Without this change, compilation with Sun C Compiler 5.9 (SunOS_i386

Re: [PATCH 3/2] git add pathspec... defaults to -A

2013-04-22 Thread Eric Sunshine
On Mon, Apr 22, 2013 at 6:41 PM, Junio C Hamano gits...@pobox.com wrote: diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 48754cb..77ad391 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -53,8 +53,14 @@ OPTIONS Files to add content

Re: [PATCH] git-prompt.sh: Show where rebase is at when interrupted by a merge conflict

2013-04-24 Thread Eric Sunshine
On Tue, Apr 23, 2013 at 8:35 AM, Zoltan Klinger zoltan.klin...@gmail.com wrote: When a rebase is interrupted by a merge conflict it could be useful to know how far a rebase has progressed and how many commits in total this rebase will apply. Teach the __git_ps1() command to display the number

Re: [PATCH] send-email: support NNTP

2013-04-24 Thread Eric Sunshine
On Tue, Apr 23, 2013 at 7:13 AM, Łukasz Stelmach l.stelm...@samsung.com wrote: Enable sending patches to NNTP servers (Usenet, Gmane). --- diff --git a/git-send-email.perl b/git-send-email.perl index bd13cc8..0356635 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1174,6

Re: [PATCH v2 9/9] completion: remove __git_index_file_list_filter()

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 4:10 PM, Felipe Contreras felipe.contre...@gmail.com wrote: Refactor the code into the only caller; __git_index_files(). Also, Somehow messing up with the 'path' variable messes up the 'PATH' s/Somehow/somehow/ s/messing up/messing/ variable. So let's not do that.

Re: [PATCH] clone: allow cloning local paths with colons in them

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 8:19 PM, Duy Nguyen pclo...@gmail.com wrote: On Sun, Apr 28, 2013 at 4:16 AM, Junio C Hamano gits...@pobox.com wrote: That was fairly hard to grok. Is that equivalent to this? if (c == ':' path strchrnul(host, '/')) { /* is the

Re: [PATCH 1/6] clone: Make the 'junk_mode' symbol a file static

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 2:39 PM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: Sparse issues an 'junk_mode' not declared. Should it be static? warning. In order to suppress the warning, since this symbol does not need more than file visibility, we simply add the static modifier to it's

Re: [PATCH v2] Add support for -i/--interactive to git-clean

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 12:13 PM, Jiang Xin worldhello@gmail.com wrote: --- a/builtin/clean.c +++ b/builtin/clean.c @@ -257,26 +261,92 @@ int cmd_clean(int argc, const char **argv, const char *prefix) } if (S_ISDIR(st.st_mode)) { -

Re: [PATCH 2/6] path: Make the 'get_st_mode_bits' symbol a file static

2013-04-27 Thread Eric Sunshine
On Sat, Apr 27, 2013 at 2:42 PM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: On MinGW, sparse issues an 'get_st_mode_bits' not declared. Should it be static? warning. The MinGW and MSVC builds do not see the declaration of this function, within git-compat-util.h, due to it's s/it's/its/

Re: [PATCH] Fix grammar in the 1.8.3 release notes.

2013-04-29 Thread Eric Sunshine
On Mon, Apr 29, 2013 at 3:15 PM, Marc Branchaud marcn...@xiplink.com wrote: --- a/Documentation/RelNotes/1.8.3.txt +++ b/Documentation/RelNotes/1.8.3.txt @@ -8,23 +8,22 @@ When git push [$there] does not say what to push, we have used the traditional matching semantics so far (all your

Re: [PATCH v2 1/8] sha1_file: allow to select pack origin when looking up an object

2013-04-30 Thread Eric Sunshine
On Mon, Apr 29, 2013 at 11:42 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: diff --git a/cache.h b/cache.h index 94ca1ac..bed403a 100644 --- a/cache.h +++ b/cache.h @@ -744,12 +744,33 @@ char *strip_path_suffix(const char *path, const char *suffix); int daemon_avoid_alias(const char

Re: [PATCH v2 3/8] sha1_file: mark alt object database from add_submodule_odb()

2013-04-30 Thread Eric Sunshine
On Mon, Apr 29, 2013 at 11:42 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: A submodule's object database may be imported to in-core object pool for a quick peek without paying the price of running a separate git command. These databases are marked in for stricter checks later to s/marked

Re: [PATCH v2 4/8] sha1_file: new object source for submodule's alt object database

2013-04-30 Thread Eric Sunshine
On Mon, Apr 29, 2013 at 11:42 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: This patch separates submodule odb sources from ordinary alternate sources. The new sources can be accessed with ODB_EXTALT (e.g. via read_sha1_file_extended). ODB_EXTALT is only added to odb_default in certain

Re: [PATCH/RFC] get_sha1: prefer 40-hex ref name over 40-hex SHA-1

2013-04-30 Thread Eric Sunshine
On Tue, Apr 30, 2013 at 11:01 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: The current behavior is inconsistent when passing SHA-1 to get_sha1. If it's a short sha-1, refs take precedence. git rev-parse 1234 will resolve refs/heads/1234 if exists even if there is an unambiguous SHA-1

Re: [PATCH 5/5] git-svn: fix empty dir tracking in branches

2013-04-30 Thread Eric Sunshine
On Tue, Apr 30, 2013 at 1:38 PM, Ilya Basin basini...@gmail.com wrote: - When creating a tag or branch from a subdir, a disjoint branch is created. Then git-svn re-imports the commits using this dir as strip path. During this re-import the variable %added_placeholder is not up

Re: [PATCH v3] Add new @ shortcut for HEAD

2013-05-01 Thread Eric Sunshine
On Wed, May 1, 2013 at 5:51 AM, Felipe Contreras felipe.contre...@gmail.com wrote: So HEAD@{0}~0^0 is too much to type, but we can remove '^0', and we can remove '~0', and we can remove 'HEAD', which leaves us with @{0}, but we can't remove '{0}'? This patch allows '@' to be the same as

Re: [PATCH 4/9] t1508 (at-combinations): increase coverage

2013-05-02 Thread Eric Sunshine
On Thu, May 2, 2013 at 9:39 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Add more tests exercising documented functionality. It is worth nothing that HEAD@{-n} is senseless because @{-n} s/nothing/noting/ cannot be used with anything other than HEAD anyway. [fc: contribute a couple

Re: [PATCH v2 4/5] index-pack, unpack-objects: add --not-so-strict for connectivity check

2013-05-03 Thread Eric Sunshine
On Fri, May 3, 2013 at 3:09 AM, Duy Nguyen pclo...@gmail.com wrote: Subject: [PATCH] clone: open a shortcut for connectivity check In order to make sure the cloned repository is good, we run rev-list --objects --not --all $new_refs on the repository. This is expensive on large repositories.

Re: [PATCH v2 2/2] cygwin: Remove the CYGWIN_V15_WIN32API build variable

2013-05-03 Thread Eric Sunshine
On Thu, May 2, 2013 at 3:29 PM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: Commit 380a4d92 (Update cygwin.c for new mingw-64 win32 api headers, 11-11-2012) solved an header include order problem on cygwin 1.7 when using the new mingw-64 WIN32 API headers. The solution involved using a new

Re: [PATCH v5 0/3] interactive git clean

2013-05-03 Thread Eric Sunshine
Usability observations below... On Thu, May 2, 2013 at 11:49 PM, Jiang Xin worldhello@gmail.com wrote: The interactive git clean combines `git clean -n` and `git clean -f` together to do safe cleaning, and has more features. First it displays what would be removed in columns (so that you

Re: [PATCH v3 2/4] fetch-pack: prepare updated shallow file before fetching the pack

2013-05-03 Thread Eric Sunshine
On Fri, May 3, 2013 at 8:35 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: index-pack --strict looks up and follows parent commits. If shallow information is not ready by the time index-pack is run, index-pack may be lead to non-existent objects. Make fetch-pack save shallow file to

Re: [PATCH v3 4/4] clone: open a shortcut for connectivity check

2013-05-03 Thread Eric Sunshine
On Fri, May 3, 2013 at 8:35 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: In order to make sure the cloned repository is good, we run rev-list --objects --not --all $new_refs on the repository. This is expensive on large repositories. This patch attempts to mitigate the impact in this

Re: [PATCH v5 0/3] interactive git clean

2013-05-05 Thread Eric Sunshine
On Fri, May 3, 2013 at 9:06 PM, Jiang Xin worldhello@gmail.com wrote: 2013/5/3 Eric Sunshine sunsh...@sunshineco.com: More generally, is this sort of modal edit mode desirable and convenient? Can the edit operation be combined with the top-level prompt? For example: % git clean -i

Re: [PATCH v5 0/3] interactive git clean

2013-05-06 Thread Eric Sunshine
Hi Matthieu, On Mon, May 6, 2013 at 3:58 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Eric Sunshine sunsh...@sunshineco.com writes: The pattern [y] will match file named 'y'. It probably is unusual for files named 'y', 'n', etc. to exist in the top-level directory, but the gitignore

Re: [PATCH v7 00/10] interactive git clean

2013-05-08 Thread Eric Sunshine
On Wed, May 8, 2013 at 7:38 AM, Jiang Xin worldhello@gmail.com wrote: When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop. Your current implementation only allows excluding items from the list of files

Re: [PATCH v7 00/10] interactive git clean

2013-05-08 Thread Eric Sunshine
On Wed, May 8, 2013 at 11:15 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, May 8, 2013 at 7:38 AM, Jiang Xin worldhello@gmail.com wrote: *** Commands *** 1: clean 2: edit by patterns3: edit by numbers 4: rm -i 5: flags: none 6

Re: [PATCH 2/2] t5004: avoid using tar for checking emptiness of archive

2013-05-09 Thread Eric Sunshine
On Thu, May 9, 2013 at 9:13 AM, René Scharfe rene.scha...@lsrfire.ath.cx wrote: Test 2 of t5004 checks if a supposedly empty tar archive really contains no files. 24676f02 (t5004: fix issue with empty archive test and bsdtar) removed our commit hash to make it work with bsdtar, but the test

Re: [PATCH v3 5/5] do not die when error in config parsing of buf occurs

2013-05-09 Thread Eric Sunshine
On Thu, May 9, 2013 at 12:21 PM, Heiko Voigt hvo...@hvoigt.net wrote: If a config parsing error in a file occurs we can die and let the user fix the issue. This is different for the buf parsing function since it can be used to parse blobs of .gitmodules files. If a parsing error occurs here we

Re: [PATCH v3 4/5] teach config --blob option to parse config from database

2013-05-09 Thread Eric Sunshine
On Thu, May 9, 2013 at 12:20 PM, Heiko Voigt hvo...@hvoigt.net wrote: This can be used to read configuration values directly from gits s/gits/git's/ database. For example it is useful for reading to be checked out .gitmodules files directly from the database. Signed-off-by: Heiko Voigt

Re: [PATCH 1/2] sha1_name.c: signal if @{-N} was a true branch nameor a detached head

2013-05-09 Thread Eric Sunshine
On Wed, May 8, 2013 at 5:12 PM, Junio C Hamano gits...@pobox.com wrote: sha1_name.c: signal if @{-N} was a true branch nameor a detached head s/nameor/name or/ The original API read checkout: moving from (.*) to ... from the reflog of the HEAD, and returned the substring between from and to,

Re: [PATCH 3/4] get_packed_refs: reload packed-refs file when it changes

2013-05-09 Thread Eric Sunshine
On Mon, May 6, 2013 at 10:43 PM, Jeff King p...@peff.net wrote: Once we read the packed-refs file into memory, we cache it to save work on future ref lookups. However, our cache may be out of date with respect to what is on disk if another process is simultaneously packing the refs. Normally

Re: [PATCH 4/8] rebase: prepare to do generic housekeeping

2013-05-10 Thread Eric Sunshine
On Fri, May 10, 2013 at 10:26 AM, Ramkumar Ramachandra artag...@gmail.com wrote: On successful completion of a rebase in git-rebase--$backend.sh, the $backend script cleans up on its own and exits. The cleanup routine is however, independent of the $backend, and each $backend script

Re: [PATCH 8/8] rebase: implement --[no-]autostash and rebase.autostash

2013-05-10 Thread Eric Sunshine
On Fri, May 10, 2013 at 10:26 AM, Ramkumar Ramachandra artag...@gmail.com wrote: diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh new file mode 100755 index 000..8386998 --- /dev/null +++ b/t/t3420-rebase-autostash.sh @@ -0,0 +1,148 @@ +#!/bin/sh +# +# Copyright

Re: [PATCH 1/4] t3400 (rebase): don't set GIT_AUTHOR_{NAME,EMAIL}

2013-05-10 Thread Eric Sunshine
On Fri, May 10, 2013 at 10:29 AM, Ramkumar Ramachandra artag...@gmail.com wrote: test-lib.sh already sets a sane GIT_AUTHOR_{NAME,EMAIL} for all test scripts to use. Don't unnecessarily duplicate the work. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- t/t3400-rebase.sh | 4

Re: [PATCHv3 2/7] diff_opt: track whether flags have been set explicitly

2013-05-10 Thread Eric Sunshine
On Fri, May 10, 2013 at 11:10 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: From: Junio C Hamano gits...@pobox.com The diff_opt infrastructure sets flags based on defaults and command line options. Currently, it is impossible to detect whether a flag has been set as a default or on

Re: [PATCH] cache.h: avoid deprecation warnings on OS X 10.8

2013-05-12 Thread Eric Sunshine
On Fri, May 10, 2013 at 10:23 PM, David Aguilar dav...@gmail.com wrote: Mac OS X Mountain Lion prints warnings when building git: warning: 'SHA1_Init' is deprecated (declared at /usr/include/openssl/sha.h:121) Silence the warnings by using the Common Digest SHA-1 functions

Re: [PATCH v2 3/3] cache.h: eliminate SHA-1 deprecation warnings on OS X 10.8

2013-05-12 Thread Eric Sunshine
On Sat, May 11, 2013 at 4:22 AM, David Aguilar dav...@gmail.com wrote: Mac OS X Mountain Lion prints warnings when building git: warning: 'SHA1_Init' is deprecated (declared at /usr/include/openssl/sha.h:121) Silence the warnings by using the Common Digest SHA-1 functions

Re: [PATCH v2 3/3] cache.h: eliminate SHA-1 deprecation warnings on OS X 10.8

2013-05-12 Thread Eric Sunshine
On Sat, May 11, 2013 at 4:22 AM, David Aguilar dav...@gmail.com wrote: Mac OS X Mountain Lion prints warnings when building git: warning: 'SHA1_Init' is deprecated (declared at /usr/include/openssl/sha.h:121) Silence the warnings by using the Common Digest SHA-1 functions

Re: [PATCHv2 04/10] remote: Reject remote names containing '/'

2013-05-12 Thread Eric Sunshine
On Sat, May 11, 2013 at 12:21 PM, Johan Herland jo...@herland.net wrote: Although we definitely support and encourage use of multi-level branch names, we have never conciously tried to give support for multi-level s/conciously/consciously/ remote names. Currently, they are allowed, but there

Re: [PATCH v3 3/3] cache.h: eliminate SHA-1 deprecation warnings on OS X 10.8

2013-05-13 Thread Eric Sunshine
for SHA1_Init(), SHA1_Update(), and SHA1_Final(). Add a COMMON_DIGEST_SHA1 option to the Makefile to allow choosing this implementation and define it by default on Darwin. Define COMMON_DIGEST_FOR_SHA1 to enable the OpenSSL compatibility macros in CommonDigest.h. Helped-by: Eric Sunshine sunsh

Re: [PATCH v4 3/3] cache.h: eliminate SHA-1 deprecation warnings on OS X 10.8

2013-05-13 Thread Eric Sunshine
approach might simply be to disable that particular warning on Darwin (via CFLAGS or perhaps '#pragma GCC diagnostic ignored' for more fine-grained control). Define COMMON_DIGEST_FOR_OPENSSL to enable the OpenSSL compatibility macros in CommonDigest.h. Helped-by: Eric Sunshine sunsh

Re: [PATCH 33/47] remote-hg: add test for new bookmark special

2013-05-14 Thread Eric Sunshine
On Tue, May 14, 2013 at 12:36 AM, Felipe Contreras felipe.contre...@gmail.com wrote: From the point of view of Mercurial, this creates a new branch head, and requires a forced push. Ideally, whoever, we would want it to work just like in git; new Did you mean s/whoever/however/ ? branches

Re: [PATCH 16/47] remote-hg: load all extensions

2013-05-14 Thread Eric Sunshine
On Tue, May 14, 2013 at 12:36 AM, Felipe Contreras felipe.contre...@gmail.com wrote: The user might have then configured differently, plus, all of them will Did you mean s/then/them/ ? be loaded anyway later on. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com -- To unsubscribe

Re: [PATCH 1/4] t5510: start tracking-ref tests from a known state

2013-05-14 Thread Eric Sunshine
On Sat, May 11, 2013 at 12:14 PM, Jeff King p...@peff.net wrote: We have three sequential tests for for whether tracking refs s/for for/for/ [or] s/for for/for checking/ are updated by various fetches and pulls; the first two should not update the ref, and the third should. Each test depends

Re: [PATCH v5 1/2] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X

2013-05-17 Thread Eric Sunshine
On Fri, May 17, 2013 at 4:21 AM, David Aguilar dav...@gmail.com wrote: On Thu, May 16, 2013 at 11:18 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Wed, May 15, 2013 at 1:56 PM, Torsten Bögershausen tbo...@web.de wrote: On 2013-05-15 09.11, David Aguilar wrote: + ifndef

[PATCH v7 0/3] Begin replacing OpenSSL with CommonCrypto

2013-05-17 Thread Eric Sunshine
This is a re-roll of David Aguilar's patch series which eliminates some of the OpenSSL deprecation warnings on Mac OS X. Patch 1 is new. It extracts the CommonCrypto-related Makefile boilerplate, from his SHA-1-related patch, into a distinct introductory patch which can then be referenced by

[PATCH v7 1/3] Makefile: add support for Apple CommonCrypto facility

2013-05-17 Thread Eric Sunshine
-by: David Aguilar dav...@gmail.com Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Makefile | 9 + 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index f698c1a..2178c2c 100644 --- a/Makefile +++ b/Makefile @@ -137,6 +137,10 @@ all:: # specify your own

[PATCH v7 2/3] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X

2013-05-17 Thread Eric Sunshine
commit message] Signed-off-by: David Aguilar dav...@gmail.com Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Makefile | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 2178c2c..7a03fe9 100644 --- a/Makefile +++ b/Makefile @@ -1398,10 +1398,16 @@ ifdef

[PATCH v7 3/3] imap-send: eliminate HMAC deprecation warnings on Mac OS X

2013-05-17 Thread Eric Sunshine
NO_APPLE_COMMON_CRYPTO instead] Signed-off-by: David Aguilar dav...@gmail.com Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- imap-send.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/imap-send.c b/imap-send.c index d9bcfb4..642448c 100644 --- a/imap-send.c +++ b/imap

Re: [PATCH] fetch: add new fetch.default configuration

2013-05-18 Thread Eric Sunshine
On Fri, May 17, 2013 at 10:18 PM, Felipe Contreras felipe.contre...@gmail.com wrote: When the user has an upstream branch configured to track a remote tracking branch: % git checkout --set-upstream-to github/master Doing a 'git fetch' without any arguments would try to fetch 'github',

[PATCH v8 0/3] Begin replacing OpenSSL with CommonCrypto

2013-05-19 Thread Eric Sunshine
This is a re-roll of David Aguilar's patch series [1] which eliminates some of the OpenSSL deprecation warnings on Mac OS X. Changes since v7: - Avoid double-negation (#ifndef NO_APPLE_COMMON_CRYPTO) - Don't break imap-send.c for platforms other than Apple [1]:

[PATCH v8 1/3] Makefile: add support for Apple CommonCrypto facility

2013-05-19 Thread Eric Sunshine
dav...@gmail.com Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Makefile | 8 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index f698c1a..cd24c94 100644 --- a/Makefile +++ b/Makefile @@ -137,6 +137,10 @@ all:: # specify your own (or DarwinPort's) include

[PATCH v8 2/3] cache.h: eliminate SHA-1 deprecation warnings on Mac OS X

2013-05-19 Thread Eric Sunshine
commit message] Signed-off-by: David Aguilar dav...@gmail.com Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Makefile | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index cd24c94..5e7cadf 100644 --- a/Makefile +++ b/Makefile @@ -1397,10 +1397,16 @@ ifdef

[PATCH v8 3/3] imap-send: eliminate HMAC deprecation warnings on Mac OS X

2013-05-19 Thread Eric Sunshine
COMMON_DIGEST_FOR_OPENSSL] Signed-off-by: David Aguilar dav...@gmail.com Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Junio Hamano writes: Doesn't this mean people on platforms that do not care what Apple does have to define NO_APPLE_COMMON_CRYPTO? It certainly does break other platforms. Thanks

[PATCH v2 2/4] employ new explicit exists in index? API

2013-09-17 Thread Eric Sunshine
a subsequent patch to relieve callers of the artificial burden of having to add a trailing '/' to the pathname given to index_dir_exists(). Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- dir.c | 10 +- read-cache.c | 4 ++-- unpack-trees.c | 4 ++-- 3 files changed, 9

[PATCH v2 1/4] name-hash: refactor polymorphic index_name_exists()

2013-09-17 Thread Eric Sunshine
for a directory search must have a trailing slash. (In order to avoid disturbing in-flight topics, index_name_exists() is retained as a thin wrapper dispatching either to index_dir_exists() or index_file_exists().) Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- cache.h | 4

[PATCH v2 0/4] stop storing trailing slash in dir-hash

2013-09-17 Thread Eric Sunshine
Eric Sunshine (4): name-hash: refactor polymorphic index_name_exists() employ new explicit exists in index? API name-hash: stop storing trailing '/' on paths in index_state.dir_hash dir: revert work-around for retired dangerous behavior cache.h| 4 dir.c | 28

[PATCH v2 4/4] dir: revert work-around for retired dangerous behavior

2013-09-17 Thread Eric Sunshine
of directory_exists_in_index_icase() has been eliminated, the work-around is now redundant, so retire it (but not the tests added by the same commit). Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- dir.c | 18 +++--- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git

Re: [PATCH] contacts: allow execution from other directories

2013-09-17 Thread Eric Sunshine
On Tue, Sep 17, 2013 at 8:50 AM, Thomas Gummerer t.gumme...@gmail.com wrote: Currently git-contacts only works if it is executed from the top level of the git repository. Enable the execution in sub directories of that repository. Thanks. This was on my to-do list but fell off my radar when I

[PATCH] contacts: fix to work in subdirectories

2013-09-17 Thread Eric Sunshine
this. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- git-contacts (in Perl) was born from Felipe's git-related v9 [1] Ruby script. That version did not handle invocation from within subdirectories, however, an earlier version (v5) of his script [2] did, and it was my intention all along

Re: [PATCH 14/17] t5302: disable sealth corruption tests when run with --packv4

2013-09-21 Thread Eric Sunshine
On Sat, Sep 21, 2013 at 9:58 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: [PATCH 14/17] t5302: disable sealth corruption tests when run with --packv4 s/sealth/stealth/ These tests assume .pack v2 format and won't work with v4. New tests may be needed to do the same thing with v4 format.

Re: [PATCH v2] git-remote-mediawiki: bugfix for pages w/ 500 revisions

2013-09-23 Thread Eric Sunshine
On Mon, Sep 23, 2013 at 1:26 PM, Benoit Person benoit.per...@gmail.com wrote: diff --git a/contrib/mw-to-git/t/t9365-continuing-queries.sh b/contrib/mw-to-git/t/t9365-continuing-queries.sh new file mode 100755 index 000..6fb5df4 --- /dev/null +++

Re: [PATCH] rebase -i: respect to core.abbrev

2013-09-28 Thread Eric Sunshine
@@ expand_todo_ids() { } collapse_todo_ids() { - transform_todo_ids --short=7 + transform_todo_ids --short Thanks, I was going to suggest this exact simplification upon reading v1. Acked-by: Eric Sunshine sunsh...@sunshineco.com } # Rearrange the todo list that has both pick

Re: [PATCH 6/9] http: update base URLs when we see redirects

2013-09-29 Thread Eric Sunshine
On Sat, Sep 28, 2013 at 4:34 AM, Jeff King p...@peff.net wrote: diff --git a/http.c b/http.c index 65a0048..8775b5c 100644 --- a/http.c +++ b/http.c @@ -921,11 +921,71 @@ static int http_request_reauth(const char *url, +static int update_url_from_redirect(struct strbuf *base, +

Re: [PATCH 6/9] http: update base URLs when we see redirects

2013-09-29 Thread Eric Sunshine
On Sun, Sep 29, 2013 at 3:32 PM, Jeff King p...@peff.net wrote: On Sun, Sep 29, 2013 at 03:26:45PM -0400, Eric Sunshine wrote: On Sat, Sep 28, 2013 at 4:34 AM, Jeff King p...@peff.net wrote: diff --git a/http.c b/http.c index 65a0048..8775b5c 100644 --- a/http.c +++ b/http.c

Re: [RFC/PATCHv2 1/3] Documentation/git-svn: Promote the use of --prefix in docs + examples

2013-10-08 Thread Eric Sunshine
On Sat, Oct 5, 2013 at 7:30 PM, Johan Herland jo...@herland.net wrote: diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 4dd3bcb..da00671 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -973,6 +979,15 @@ without giving any repository layout

Re: [RFC/PATCHv2 2/3] git-svn: Warn about changing default for --prefix in Git v2.0

2013-10-08 Thread Eric Sunshine
On Sat, Oct 5, 2013 at 7:30 PM, Johan Herland jo...@herland.net wrote: diff --git a/t/t9117-git-svn-init-clone.sh b/t/t9117-git-svn-init-clone.sh index b7ef9e2..1c8d049 100755 --- a/t/t9117-git-svn-init-clone.sh +++ b/t/t9117-git-svn-init-clone.sh @@ -52,4 +52,71 @@ test_expect_success 'clone

Re: [PATCH try2 09/14] apply: add --stage option

2013-10-13 Thread Eric Sunshine
On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras felipe.contre...@gmail.com wrote: Synonym for --index. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-apply.txt | 5 - builtin/apply.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)

Re: [PATCH try2 7/8] push: add --set-publish option

2013-10-13 Thread Eric Sunshine
On Sat, Oct 12, 2013 at 3:05 AM, Felipe Contreras felipe.contre...@gmail.com wrote: diff --git a/t/t5529-push-publish.sh b/t/t5529-push-publish.sh new file mode 100755 index 000..2037026 --- /dev/null +++ b/t/t5529-push-publish.sh @@ -0,0 +1,70 @@ +#!/bin/sh + +test_description='push

Re: [PATCH v5 1/3] test: use unambigous leading path (/foo) for MSYS

2013-10-14 Thread Eric Sunshine
On Sun, Oct 13, 2013 at 10:29 PM, Jiang Xin worldhello@gmail.com wrote: In test cases for relative_path, path with one leading character (such as /a, /x) may be recogonized as a:/ or x:/ if there is such DOS drive on MSYS platform. Use an umambigous leading path /foo instead. Also change

Re: [PATCH v3 05/10] fast-export: add new --refspec option

2013-10-14 Thread Eric Sunshine
On Sat, Oct 12, 2013 at 3:05 AM, Felipe Contreras felipe.contre...@gmail.com wrote: So that we can covert the exported ref names. s/covert/convert/ [1] [1]: http://thread.gmane.org/gmane.comp.version-control.git/225475/focus=225489 Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --

Re: [PATCH try2 01/14] Add proper 'stage' command

2013-10-14 Thread Eric Sunshine
On Sat, Oct 12, 2013 at 3:04 AM, Felipe Contreras felipe.contre...@gmail.com wrote: SYNOPSIS [verse] -'git stage' args... - +'git stage' [options] [--] [paths...] +'git stage add' [options] [--] [paths...] +'git stage reset' [-q|--patch] [--] [paths...] +'git stage diff'

Re: [PATCH v2 01/14] Add proper 'stage' command

2013-10-14 Thread Eric Sunshine
On Mon, Oct 14, 2013 at 6:29 PM, Felipe Contreras felipe.contre...@gmail.com wrote: diff --git a/builtin/stage.c b/builtin/stage.c new file mode 100644 index 000..3023d17 --- /dev/null +++ b/builtin/stage.c @@ -0,0 +1,52 @@ +/* + * 'git stage' builtin command + * + * Copyright (C)

Re: [PATCH] sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

2013-10-18 Thread Eric Sunshine
On Fri, Oct 18, 2013 at 9:17 AM, Johan Herland jo...@herland.net wrote: There are cases (e.g. when running concurrent fetches in a repo) where multiple Git processes concurrently attempt to create loose objects within the same objects/XX/ dir. The creation of the loose object files is (AFAICS)

Re: [PATCH] sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

2013-10-18 Thread Eric Sunshine
On Fri, Oct 18, 2013 at 10:52 AM, Johan Herland jo...@herland.net wrote: On Fri, Oct 18, 2013 at 3:53 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Oct 18, 2013 at 9:17 AM, Johan Herland jo...@herland.net wrote: There are cases (e.g. when running concurrent fetches in a repo) where

Re: [PATCH 2/2] merge-base: --reflog mode finds fork point from reflog entries

2013-10-24 Thread Eric Sunshine
On Thu, Oct 24, 2013 at 3:11 PM, Junio C Hamano gits...@pobox.com wrote: diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index f80bba8..3a1abee 100755 --- a/t/t6010-merge-base.sh +++ b/t/t6010-merge-base.sh @@ -230,4 +230,31 @@ test_expect_success 'criss-cross merge-base for

Re: [PATCH 2/2] merge-base: --reflog mode finds fork point from reflog entries

2013-10-24 Thread Eric Sunshine
On Thu, Oct 24, 2013 at 5:26 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: On Thu, Oct 24, 2013 at 3:11 PM, Junio C Hamano gits...@pobox.com wrote: diff --git a/t/t6010-merge-base.sh b/t/t6010-merge-base.sh index f80bba8..3a1abee 100755 --- a/t

Re: [PATCH v3 2/2] merge-base: teach --fork-point mode

2013-10-25 Thread Eric Sunshine
On Fri, Oct 25, 2013 at 5:38 PM, Junio C Hamano gits...@pobox.com wrote: diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index 87842e3..b383766 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -137,6 +143,31 @@ In

Re: [PATCH v4 07/10] fast-import: add support to delete refs

2013-10-27 Thread Eric Sunshine
On Sun, Oct 27, 2013 at 3:05 AM, Felipe Contreras felipe.contre...@gmail.com wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-fast-import.txt | 3 +++ fast-import.c | 13 ++--- t/t9300-fast-import.sh| 18

Re: [PATCH/RFC] git clone: is an URL local or ssh

2013-10-27 Thread Eric Sunshine
On Saturday, October 26, 2013, Torsten Bögershausen wrote: diff --git a/connect.c b/connect.c index 06e88b0..903063e 100644 --- a/connect.c +++ b/connect.c @@ -564,9 +574,9 @@ struct child_process *git_connect(int fd[2], const char *url_orig, char *url; char *host, *path;

Re: git-completion.bash error

2013-10-27 Thread Eric Sunshine
On Sun, Oct 27, 2013 at 4:59 PM, Gabriel gabriel...@gmail.com wrote: I've just made a clean install of OS X Mavericks and installed Git via Homebrew, which obviously includes the contrib files. I sourced the git-completion.bash into my profile and I get stuck on a error every time I try to

<    2   3   4   5   6   7   8   9   10   11   >