Re: [PATCH] commit: Add -f, --fixes commit option to add Fixes: line

On Thu, Oct 31, 2013 at 1:12 AM, Johan Herland jo...@herland.net wrote: Yes, we do lack a good infrastructure for managing Git hooks from multiple sources. It makes people afraid to use them, because they might conflict with hooks from another source. There are (off the top of my head): -

Re: [PATCH v4] remote-curl: fix large pushes with GSSAPI

On Wed, Oct 30, 2013 at 10:40:30PM +, brian m. carlson wrote: If you would split it out, that would be great. Then I'll simply rebase my patch on top of yours and go from there. I just included your patch on top, since it was the residue left over after committing my refactoring. Please

[PATCH 1/3] http: return curl's AUTHAVAIL via slot_results

Callers of the http code may want to know which auth types were available for the previous request. But after finishing with the curl slot, they are not supposed to look at the curl handle again. We already handle returning other information via the slot_results struct; let's add a flag to check

[PATCH 2/3] remote-curl: pass curl slot_results back through run_slot

Some callers may want to know more than just the integer error code we return. Let them optionally pass a slot_results struct to fill in (or NULL if they do not care). In either case we continue to return the integer code. We can also give probe_rpc the same treatment (since it builds directly on

[PATCH 3/3] remote-curl: fix large pushes with GSSAPI

From: brian m. carlson sand...@crustytoothpaste.net Due to an interaction between the way libcurl handles GSSAPI authentication over HTTP and the way git uses libcurl, large pushes (those over http.postBuffer bytes) would fail due to an authentication failure requiring a rewind of the curl

Re: [PATCH v2] gitk: Add a horizontal scrollbar for commit history

On Wed, Oct 30, 2013 at 01:47:08PM +0100, Nicolas Cornu wrote: This is useful on all our repos, every times, as we put a tag per day. If the HEAD didn't move during 150 days, we got 150 tags. Here is a patch that I did some time ago but have never pushed out. Do you think it is an improvement

[PATCH 01/16] merge: simplify ff-only option

No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/merge.c | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index 02a69c1..41fb66d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@

[PATCH 00/16] Trivial patches

Most of these have been sent before, but were not applied for one reason or another. Felipe Contreras (16): merge: simplify ff-only option t: replace pulls with merges pull: cleanup documentation fetch: add missing documentation revision: add missing include shortlog: add missing

[PATCH 02/16] t: replace pulls with merges

This is what the code intended. No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/annotate-tests.sh| 2 +- t/t4200-rerere.sh | 2 +- t/t9114-git-svn-dcommit-merge.sh | 2 +-

[PATCH 06/16] shortlog: add missing declaration

Otherwise we would have to include commit.h. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- shortlog.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shortlog.h b/shortlog.h index de4f86f..54bc07c 100644 --- a/shortlog.h +++ b/shortlog.h @@ -19,6 +19,8 @@ struct shortlog {

[PATCH 15/16] setup: trivial style fixes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.c b/setup.c index dbf4138..5432a31 100644 --- a/setup.c +++ b/setup.c @@ -563,7 +563,7 @@ static const char *setup_git_directory_gently_1(int

[PATCH 05/16] revision: add missing include

Otherwise we might not have 'struct diff_options'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- revision.h | 1 + 1 file changed, 1 insertion(+) diff --git a/revision.h b/revision.h index e7f1d21..89132df 100644 --- a/revision.h +++ b/revision.h @@ -5,6 +5,7 @@ #include

[PATCH 09/16] transport-helper: trivial style fix

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/transport-helper.c b/transport-helper.c index b32e2d6..673b7c2 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -269,6 +269,7 @@ static const char

[PATCH 16/16] add: avoid yoda conditions

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/add.c b/builtin/add.c index 226f758..9b30356 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -429,7 +429,7 @@ int cmd_add(int argc, const char

[PATCH 12/16] revision: trivial style fixes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- revision.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/revision.c b/revision.c index 3fdea51..956040c 100644 --- a/revision.c +++ b/revision.c @@ -1519,7 +1519,7 @@ struct cmdline_pathspec {

[PATCH 14/16] run-command: trivial style fixes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- run-command.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/run-command.c b/run-command.c index 1b7f88e..3914d9c 100644 --- a/run-command.c +++ b/run-command.c @@ -406,13 +406,12 @@ fail_pipe:

[PATCH 11/16] pretty: trivial style fix

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- pretty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pretty.c b/pretty.c index b4e32b7..962e82b 100644 --- a/pretty.c +++ b/pretty.c @@ -497,7 +497,7 @@ void pp_user_info(struct pretty_print_context *pp,

[PATCH 03/16] pull: cleanup documentation

'origin/master' is very clear, no need to specify the 'remotes/' prefix, or babysit the user. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt

[PATCH 13/16] diff: trivial style fix

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/diff.c b/builtin/diff.c index 2fb8c5d..adb93a9 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -169,7 +169,7 @@ static int

[PATCH 08/16] sha1-name: trivial style cleanup

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sha1_name.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sha1_name.c b/sha1_name.c index 0e5fe7f..e9c2999 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -343,7 +343,6 @@ static int get_short_sha1(const char *name, int len,

[PATCH 10/16] describe: trivial style fixes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/describe.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/describe.c b/builtin/describe.c index b9d3603..6f62109 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -9,7 +9,7 @@

[PATCH 07/16] branch: trivial style fix

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/branch.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index ad0f86d..5696cf0 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -975,9 +975,8 @@ int

[PATCH] t: branch: improve test rollback

After every test the environment should be as close as to how it was before as possible. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3200-branch.sh | 71 +++ 1 file changed, 35 insertions(+), 36 deletions(-) diff --git

[PATCH v5 09/10] fast-export: add support to delete refs

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 14 ++ t/t9350-fast-export.sh | 11 +++ 2 files changed, 25 insertions(+) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index b6f623e..8ed41b4 100644 ---

[PATCH v5 08/10] fast-import: add support to delete refs

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 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git

[PATCH v5 05/10] fast-export: improve argument parsing

We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index

[PATCH v5 06/10] fast-export: add new --refspec option

So that we can convert the exported ref names. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 30 ++ t/t9350-fast-export.sh| 7 +++ 3 files changed, 41

[PATCH v5 03/10] transport-helper: add 'force' to 'export' helpers

Otherwise they cannot know when to force the push or not (other than hacks). Tests-by: Richard Hansen rhan...@bbn.com Documentation-by: Richard Hansen rhan...@bbn.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/gitremote-helpers.txt | 4

[PATCH v5 02/10] transport-helper: don't update refs in dry-run

The remote helper namespace should not be updated. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/transport-helper.c b/transport-helper.c index 985eeea..d05fc7c 100644 ---

[PATCH v5 01/10] transport-helper: fix extra lines

Commit 9c51558 (transport-helper: trivial code shuffle) moved these lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec') had a wrong merge conflict and readded them. Reported-by: Richard Hansen rhan...@bbn.com Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

[PATCH v5 07/10] transport-helper: add support for old:new refspec

By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 13 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/t/t5801-remote-helpers.sh

[PATCH v5 04/10] transport-helper: check for 'forced update' message

So the remote-helpers can tell us when a forced push was needed. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index ed238e5..5aba15c 100644 ---

[PATCH v5 00/10] transport-helper: updates

Hi, Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs, --force, --dry-run, reporting forced update, everything works. Some of these were were sent before and rejected without a reason, but here they are again in case

[PATCH v5 10/10] transport-helper: add support to delete branches

For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 11 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/t/t5801-remote-helpers.sh

[PATCH (resend) 0/3] Minor f-e-r enhacements

Hi, I've been running git with these patches applied locally for a long time. Although I've sent them to the list before, they've been overlooked. Thanks. Ramkumar Ramachandra (3): for-each-ref: introduce %C(...) for color for-each-ref: introduce %(HEAD) asterisk marker for-each-ref:

[PATCH 1/3] for-each-ref: introduce %C(...) for color

Enhance 'git for-each-ref' with color formatting options. You can now use the following format in for-each-ref: %C(green)%(refname:short)%C(reset) Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- Documentation/git-for-each-ref.txt | 4 +++- builtin/for-each-ref.c | 23

[PATCH 2/3] for-each-ref: introduce %(HEAD) asterisk marker

'git branch' shows which branch you are currently on with an '*', but 'git for-each-ref' misses this feature. So, extend its format with %(HEAD) for the same effect. Now you can use the following format in for-each-ref: %C(red)%(HEAD)%C(reset) %(refname:short) to display a red asterisk next

[PATCH 3/3] for-each-ref: introduce %(upstream:track[short])

Introduce %(upstream:track) to display [ahead M, behind N] and %(upstream:trackshort) to display =, , , or appropriately (inspired by contrib/completion/git-prompt.sh). Now you can use the following format in for-each-ref: %C(green)%(refname:short)%C(reset)%(upstream:trackshort) to display

Re: Show patch in gitk --first-parent ?

On Wed, Oct 30, 2013 at 6:55 PM, Andreas Schwab sch...@linux-m68k.org wrote: While not automatic, you can right click on the parent and select Diff this-selected. And there's also the option to mark a commit, and diff this with marked. Thanks, that's just what I needed (although as you say, it

sticked - stuck

Here is a patch to replace the word 'sticked' with 'stuck' in existing documentation. And the patch for nv/parseopt-opt-arg changed to use the word 'stuck' too. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

[PATCH 2/2] rev-parse --parseopt: add the --stuck-long mode

Add the --stuck-long option to output the options in their long form if available, and with their arguments stuck. Contrary to the default form (non stuck arguments and short options), this can be parsed unambiguously when using options with optional arguments : - in the non stuck form, when an

[PATCH 1/2] Use the word 'stuck' instead of 'sticked'

The past participle of 'stick' is 'stuck'. Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- Documentation/gitcli.txt | 6 +++--- Documentation/technical/api-parse-options.txt | 6 +++--- diff.c| 2 +- diff.h

Re: [PATCH v2 11/19] pack-objects: use bitmaps when packing objects

On Thu, Oct 31, 2013 at 3:07 AM, Jeff King p...@peff.net wrote: I think there are two cases that we need to consider: 1. We have a full repo and somebody requests a shallow clone for us. We probably do not want to use bitmaps here. In the series we have been testing, shallow

[PATCH] Fix '\%o' for printf from coreutils

The printf utility provided by coreutils when interpreting '\%o' format does not recognize %o as formatting directive. For example printf '\%o 0 returns \%o and warning: ignoring excess arguments, starting with ‘0’, which results in failed tests in t5309-pack-delta-cycles.sh. In most shells the

Re: htonll, ntohll

On 2013-10-30 22.07, Ramsay Jones wrote: On 30/10/13 20:30, Torsten Bögershausen wrote: On 2013-10-30 20.06, Ramsay Jones wrote: On 30/10/13 17:14, Torsten Bögershausen wrote: On 2013-10-30 18.01, Vicent Martí wrote: On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen tbo...@web.de wrote:

[PATCH] Test code for htonll, ntohll

test-endianess.c adds test code for htonl(), ntohll() and the recently introduced ntohll() and htonll() The test is called in t0070 Signed-off-by: Torsten Bögershausen tbo...@web.de --- .gitignore |1 + Makefile |3 +++ t/t0070-fundamental.sh |3 +++

[PATCH] gitk: Add First parent checkbox

Sometimes it's desirable to see what changes were introduced by a merge commit, rather than how conflicts were resolved. This adds a checkbox which, when turned on, makes gitk show the equivalent of git show --first-parent commit for merge commits. Signed-off-by: Stefan Haller

Re: Help creating git alias

On Wed, Oct 30, 2013 at 11:54 PM, Junio C Hamano gits...@pobox.com wrote: Eugene Sajine eugu...@gmail.com writes: That was my initial intention, because I would like to be able to pass parameters like to git log or git blame correctly without the explicit use of $1. Could you please advise

Re: [PATCH] Fix '\%o' for printf from coreutils

On Thu, Oct 31, 2013 at 12:51:32PM +0100, Kacper Kornet wrote: The printf utility provided by coreutils when interpreting '\%o' format does not recognize %o as formatting directive. For example printf '\%o 0 returns \%o and warning: ignoring excess arguments, starting with ‘0’, which results

[BUG?] error: cache entry has null sha1

This is totally unrelated to this thread, but I am seeing a strange error from the let's make sure we won't write null sha1 code we added recently. This reproduces reliably for me, even in a freshly cloned repository without previous rerere records: - Check out v1.8.4.1 $ git checkout

Re: [BUG?] error: cache entry has null sha1

On Thu, Oct 31, 2013 at 10:11:49AM -0700, Junio C Hamano wrote: - Try to discard $ git am --abort error: cache entry has null sha1: remote-curl.c fatal: unable to write new index file This should not happen, no? git reset --hard will remove the funnies, but still... I

Re: [PATCH] commit: Add -f, --fixes commit option to add Fixes: line

Duy Nguyen pclo...@gmail.com writes: OK how about, if $GIT_DIR/hooks/something is a directory, then the directory must contain a file named index, listing all the hooks of type something. All the hooks in index will be executed in the listing order. Hooks that take arbitrary amount of

Re: [BUG?] error: cache entry has null sha1

On Thu, Oct 31, 2013 at 01:15:39PM -0400, Jeff King wrote: On Thu, Oct 31, 2013 at 10:11:49AM -0700, Junio C Hamano wrote: - Try to discard $ git am --abort error: cache entry has null sha1: remote-curl.c fatal: unable to write new index file This should not

Re: Help creating git alias

On Thu, Oct 31, 2013 at 11:36:59AM -0400, Eugene Sajine wrote: On Wed, Oct 30, 2013 at 11:54 PM, Junio C Hamano gits...@pobox.com wrote: Eugene Sajine eugu...@gmail.com writes: That was my initial intention, because I would like to be able to pass parameters like to git log or git blame

Re: [PATCH v5 00/10] transport-helper: updates

On 31.10.2013, at 10:36, Felipe Contreras felipe.contre...@gmail.com wrote: Hi, Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs, --force, --dry-run, reporting forced update, everything works. I looked

Re: [PATCH 00/16] Trivial patches

On 31.10.2013, at 10:25, Felipe Contreras felipe.contre...@gmail.com wrote: Most of these have been sent before, but were not applied for one reason or another. All of these look fine and sensible to me. Some of the latter patches in the series might be a bit subjective (e.g. I personally

Re: [PATCH 01/16] merge: simplify ff-only option

Felipe Contreras felipe.contre...@gmail.com writes: No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/merge.c | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index

Re: Help creating git alias

David Aguilar dav...@gmail.com writes: A-ha.. I think adding the chdir to alias is possible using a function. You do not have to use a function to do so, no? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [BUG?] error: cache entry has null sha1

Thanks for the pointers. -- 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 v5 00/10] transport-helper: updates

Max Horn m...@quendi.de writes: On 31.10.2013, at 10:36, Felipe Contreras felipe.contre...@gmail.com wrote: Hi, Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs, --force, --dry-run, reporting forced

Re: [PATCH 04/16] fetch: add missing documentation

Felipe Contreras felipe.contre...@gmail.com writes: There's no mention of the 'origin' default, or the fact that the upstream tracking branch remote is used. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-fetch.txt | 3 +++ 1 file changed, 3 insertions(+)

Re: [PATCH 05/16] revision: add missing include

Felipe Contreras felipe.contre...@gmail.com writes: Otherwise we might not have 'struct diff_options'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- revision.h | 1 + 1 file changed, 1 insertion(+) diff --git a/revision.h b/revision.h index e7f1d21..89132df 100644 ---

Re: [PATCH 03/16] pull: cleanup documentation

Felipe Contreras felipe.contre...@gmail.com writes: 'origin/master' is very clear, no need to specify the 'remotes/' prefix, or babysit the user. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2

Re: Help creating git alias

On Thu, Oct 31, 2013 at 11:07:19AM -0700, Junio C Hamano wrote: David Aguilar dav...@gmail.com writes: A-ha.. I think adding the chdir to alias is possible using a function. You do not have to use a function to do so, no? Right, of course. So something like: [alias] example =

Re: [PATCH v5 01/10] transport-helper: fix extra lines

Felipe Contreras felipe.contre...@gmail.com writes: Commit 9c51558 (transport-helper: trivial code shuffle) moved these lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec') had a wrong merge conflict and readded them. Reported-by: Richard Hansen rhan...@bbn.com

Re: [PATCH v5 03/10] transport-helper: add 'force' to 'export' helpers

Felipe Contreras felipe.contre...@gmail.com writes: Otherwise they cannot know when to force the push or not (other than hacks). ... diff --git a/transport-helper.c b/transport-helper.c index d05fc7c..ed238e5 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -854,6 +854,11 @@

Re: [PATCH v5 06/10] fast-export: add new --refspec option

Felipe Contreras felipe.contre...@gmail.com writes: +test_expect_success 'use refspec' ' + git fast-export --refspec refs/heads/master:refs/heads/foobar master | \ + grep ^commit | sort | uniq actual It feels somewhat redundant that you have to twice say that you are

Re: [PATCH v5 00/10] transport-helper: updates

On Thu, Oct 31, 2013 at 12:10 PM, Junio C Hamano gits...@pobox.com wrote: Max Horn m...@quendi.de writes: In other words: Would be really nice to see these applied! The series is sitting on the 'pu' branch, and I think there were some fixup suggestions during the review, so it may need to be

Re: [PATCH] t: branch: improve test rollback

Felipe Contreras felipe.contre...@gmail.com writes: After every test the environment should be as close as to how it was before as possible. Alternatively, each individual tests in a sequence of tests can choose to set the test environment to its preferred state before proceeding. Starting

Re: [PATCH v5 00/10] transport-helper: updates

Junio C Hamano gits...@pobox.com writes: Max Horn m...@quendi.de writes: On 31.10.2013, at 10:36, Felipe Contreras felipe.contre...@gmail.com wrote: Hi, Here are the patches that allow transport helpers to be completely transparent; renaming branches, deleting them, custom refspecs,

Re: [PATCH 03/16] pull: cleanup documentation

On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -39,7 +39,7 @@ Assume the following history exists and the current branch is `master`:

Re: [PATCH] t: branch: improve test rollback

On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 0fe7647..33673e0 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -329,7 +329,7 @@

Re: [PATCH] t: branch: improve test rollback

Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 0fe7647..33673e0 100755 --- a/t/t3200-branch.sh +++

Re: [PATCH v5 06/10] fast-export: add new --refspec option

On Thu, Oct 31, 2013 at 12:26 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: +test_expect_success 'use refspec' ' + git fast-export --refspec refs/heads/master:refs/heads/foobar master | \ + grep ^commit | sort | uniq actual

Re: [PATCH v5 08/10] fast-import: add support to delete refs

On 31.10.2013, at 10:36, 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 v5 00/10] transport-helper: updates

On 31.10.2013, at 19:10, Junio C Hamano gits...@pobox.com wrote: Max Horn m...@quendi.de writes: On 31.10.2013, at 10:36, Felipe Contreras felipe.contre...@gmail.com wrote: Hi, Here are the patches that allow transport helpers to be completely transparent; renaming branches,

Re: [PATCH v5 03/10] transport-helper: add 'force' to 'export' helpers

On Thu, Oct 31, 2013 at 12:21 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Otherwise they cannot know when to force the push or not (other than hacks). ... diff --git a/transport-helper.c b/transport-helper.c index d05fc7c..ed238e5 100644

Re: [PATCH] t: branch: improve test rollback

On Thu, Oct 31, 2013 at 12:50 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: diff --git a/t/t3200-branch.sh

Re: [PATCH 03/16] pull: cleanup documentation

Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -39,7 +39,7 @@ Assume the following history

Re: [PATCH 06/16] shortlog: add missing declaration

Felipe Contreras felipe.contre...@gmail.com writes: Otherwise we would have to include commit.h. Was there a reason why commit.h is not included here, just like revision.h would include diff.h, so that users of shortlog.h do not have to worry about including commit.h themselves? Note: not

Re: [PATCH 04/16] fetch: add missing documentation

On Thu, Oct 31, 2013 at 12:10 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index e08a028..7e75dc4 100644 --- a/Documentation/git-fetch.txt +++

Re: [PATCH v5 03/10] transport-helper: add 'force' to 'export' helpers

Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 12:21 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Otherwise they cannot know when to force the push or not (other than hacks). ... diff --git a/transport-helper.c

Re: [PATCH 03/16] pull: cleanup documentation

On 31.10.2013, at 20:00, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: [...] If you want to be pedantic, this is the reality: D---E---F---G master You are wrong again. The reality is more like this:

Re: [PATCH v5 09/10] fast-export: add support to delete refs

Actually, I just noticed one thing that I *do* have a question about: On 31.10.2013, at 10:36, Felipe Contreras felipe.contre...@gmail.com wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/fast-export.c | 14 ++ t/t9350-fast-export.sh | 11 +++

Re: Help creating git alias

On Thu, Oct 31, 2013 at 2:15 PM, David Aguilar dav...@gmail.com wrote: On Thu, Oct 31, 2013 at 11:07:19AM -0700, Junio C Hamano wrote: David Aguilar dav...@gmail.com writes: A-ha.. I think adding the chdir to alias is possible using a function. You do not have to use a function to do so,

Re: [PATCH 06/16] shortlog: add missing declaration

On Thu, Oct 31, 2013 at 1:05 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Otherwise we would have to include commit.h. Was there a reason why commit.h is not included here, just like revision.h would include diff.h, so that users of

Re: [PATCH 1/2] Use the word 'stuck' instead of 'sticked'

Nicolas Vigier bo...@mars-attacks.org writes: The past participle of 'stick' is 'stuck'. Signed-off-by: Nicolas Vigier bo...@mars-attacks.org --- Thanks. It was good that we caught this before introducing the option; the documentation update does not hurt the users much, but if we unleash a

Re: Help creating git alias

Eugene Sajine eugu...@gmail.com writes: One note: i tried the ${GIT_PREFIX:-.} and ${GIT_PREFIX} and it seems to give the same results. What is the expected difference here? GIT_PREFIX may be an empty string when you run from the top-level, in which case you would end up with cd ... and end

Re: [PATCH v5 09/10] fast-export: add support to delete refs

On Thu, Oct 31, 2013 at 1:29 PM, Max Horn m...@quendi.de wrote: Actually, I just noticed one thing that I *do* have a question about: On 31.10.2013, at 10:36, Felipe Contreras felipe.contre...@gmail.com wrote: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

Re: [PATCH 03/16] pull: cleanup documentation

Max Horn m...@quendi.de writes: ... The reality is more like this: origin/master in your repository | v A---B---C master at origin / D---E---F---G master in your repository if you really want to write origin/master somewhere in this illustration.

Re: [PATCH v5 09/10] fast-export: add support to delete refs

On 31.10.2013, at 20:41, Felipe Contreras felipe.contre...@gmail.com wrote: On Thu, Oct 31, 2013 at 1:29 PM, Max Horn m...@quendi.de wrote: Actually, I just noticed one thing that I *do* have a question about: On 31.10.2013, at 10:36, Felipe Contreras felipe.contre...@gmail.com wrote:

Re: [PATCH 16/16] add: avoid yoda conditions

I was recently confused by the yoda condition in this block of code from [1] + for (i = 0; i revs.nr; i++) + if (bases-item-object == revs.commit[i]-object) + break; /* found */ + if (revs.nr = i) I think I was particularly surprised because it came so soon after the i revs.nr. I didn't bother

Re: [PATCH v5 09/10] fast-export: add support to delete refs

On Thu, Oct 31, 2013 at 1:47 PM, Max Horn m...@quendi.de wrote: On 31.10.2013, at 20:41, Felipe Contreras felipe.contre...@gmail.com wrote: On Thu, Oct 31, 2013 at 1:29 PM, Max Horn m...@quendi.de wrote: Actually, I just noticed one thing that I *do* have a question about: On 31.10.2013, at

Re: [PATCH 16/16] add: avoid yoda conditions

On Thu, Oct 31, 2013 at 1:48 PM, Martin von Zweigbergk martinv...@gmail.com wrote: I guess what I'm trying to say is that either we accept them and get used to reading them without being surprised, or we can change a bit more than one at a time perhaps? I understand that this was an

Re: [PATCH 03/16] pull: cleanup documentation

On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: --- a/Documentation/git-pull.txt +++

Re: [PATCH 06/16] shortlog: add missing declaration

Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 1:05 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Otherwise we would have to include commit.h. Was there a reason why commit.h is not included here, just like

Re: Help creating git alias

On Thu, Oct 31, 2013 at 3:41 PM, Junio C Hamano gits...@pobox.com wrote: Eugene Sajine eugu...@gmail.com writes: One note: i tried the ${GIT_PREFIX:-.} and ${GIT_PREFIX} and it seems to give the same results. What is the expected difference here? GIT_PREFIX may be an empty string when you

Re: [PATCH 03/16] pull: cleanup documentation

Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras

Re: [PATCH 16/16] add: avoid yoda conditions

Martin von Zweigbergk martinv...@gmail.com writes: I was recently confused by the yoda condition in this block of code from [1] + for (i = 0; i revs.nr; i++) + if (bases-item-object == revs.commit[i]-object) + break; /* found */ + if (revs.nr = i) I think I was particularly surprised

Re: [PATCH 16/16] add: avoid yoda conditions

On Thu, Oct 31, 2013 at 2:31 PM, Junio C Hamano gits...@pobox.com wrote: I agree that there is no justification to write if 0 == something, when if something == 0 suffices. The latter reads better and that is why the phrase yoda condition was invented. But the situation is different when

  1   2   >