Re: [PATCH] fetch: Print full url in header

2014-01-09 Thread Tom Miller
; i--) ; url_len = i + 1; if (4 i !strncmp(.git, url + i - 3, 4)) url_len = i - 3; Thanks, Tom Miller -- 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

[PATCH] fetch: Print full url in header

2014-01-08 Thread Tom Miller
- upstream/maint Signed-off-by: Tom Miller jacker...@gmail.com --- This patch should be based on the tip of next because it is dependent on the code from tm/fetch-prune. Initially I thought I would stop anonymizing the header url as well. Then I ran across this commit. commit

[PATCH V3 2/2] fetch --prune: Run prune before fetching

2014-01-02 Thread Tom Miller
the problem. This patch changes the way fetch --prune works by moving the pruning operation before the fetching operation. Instead of warning the user of a conflict, it autmatically fixes it. Signed-off-by: Tom Miller jacker...@gmail.com Tested-by: Thomas Rast t...@thomasrast.ch Acked-by: Junio C Hamano

[PATCH V3 1/2] fetch --prune: Always print header url

2014-01-02 Thread Tom Miller
Output after this patch: $ git fetch --prune remote-with-no-new-refs From https://github.com/git/git x [deleted] (none) - origin/test Signed-off-by: Tom Miller jacker...@gmail.com --- I decided it is not worth writing a function to format the header url

[PATCH V2 1/2] fetch --prune: Always print header url

2013-12-19 Thread Tom Miller
Output after this patch: $ git fetch --prune remote-with-no-new-refs From https://github.com/git/git.git x [deleted] (none) - origin/test Signed-off-by: Tom Miller jacker...@gmail.com --- builtin/fetch.c | 22 ++ t/t5510-fetch.sh | 12

[PATCH V2 2/2] fetch --prune: Run prune before fetching

2013-12-19 Thread Tom Miller
the problem. This patch changes the way fetch --prune works by moving the pruning operation before the fetching operation. Instead of warning the user of a conflict, it autmatically fixes it. Signed-off-by: Tom Miller jacker...@gmail.com Tested-by: Thomas Rast t...@thomasrast.ch --- builtin/fetch.c | 10

[PATCH 1/3] builtin/fetch.c: Add pretty_url() and print_url()

2013-12-18 Thread Tom Miller
url to stderr as indicated above in the example output. It uses a global variable named gshown_url' to prevent this header for being printed twice. Signed-off-by: Tom Miller jacker...@gmail.com --- builtin/fetch.c | 60 - 1 file changed, 42

[PATCH 3/3] fetch --prune: Repair branchname DF conflicts

2013-12-18 Thread Tom Miller
a fetch. Signed-off-by: Tom Miller jacker...@gmail.com Tested-by: Thomas Rast t...@thomasrast.ch --- builtin/fetch.c | 10 +- t/t5510-fetch.sh | 14 ++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index e50b697..845c687

[PATCH 2/3] fetch --prune: Always print header url

2013-12-18 Thread Tom Miller
After this patch the output of fetch --prune should look like this: $ git fetch --prune --dry-run origin From https://github.com/git/git x [deleted] (none) - origin/test Signed-off-by: Tom Miller jacker...@gmail.com --- builtin/fetch.c | 9 ++--- 1 file changed, 6 insertions

Re: [PATCH 1/3] builtin/fetch.c: Add pretty_url() and print_url()

2013-12-18 Thread Tom Miller
On Wed, Dec 18, 2013 at 3:47 PM, Junio C Hamano gits...@pobox.com wrote: Tom Miller jacker...@gmail.com writes: In order to fix branchname DF conflicts during `fetch --prune`, the way the header is output to the screen needs to be refactored. Here is an exmaple of the output with the line

Re: [PATCH 3/3] fetch --prune: Repair branchname DF conflicts

2013-12-18 Thread Tom Miller
On Wed, Dec 18, 2013 at 3:54 PM, Junio C Hamano gits...@pobox.com wrote: Tom Miller jacker...@gmail.com writes: When a branchname DF conflict occurs during a fetch, You may have started with a specific case in which you want to change the behaviour of current Git, so it may be clear what you

[PATCH/WIP] Repair DF conflicts during fetch.

2013-11-29 Thread Tom Miller
with the codebase or C. Thanks, for any help that I may recieve in advaned this is my first time posting. If I have submitted this wrong I applogize and look forward to any advice that I may recieve in correcting my mistakes. Tom Miller (1): Repair DF conflicts during fetch. builtin/fetch.c | 10

[PATCH/WIP] Repair DF conflicts during fetch.

2013-11-29 Thread Tom Miller
-by: Tom Miller jacker...@gmail.com --- builtin/fetch.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index bd7a101..f7959d0 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -824,11 +824,6 @@ static int do_fetch(struct transport