else
url = xstrdup("foreign");
url_len = strlen(url);
for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
;
url_len = i + 1;
if (4 < i && !strncmp(".git", url + i -
dot-git-and-slash
From https://github.com/git/git.git/
a155a5f..5512ac5 maint -> upstream/maint
Signed-off-by: Tom Miller
---
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
he user to use "git
remote prune" to fix 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
Tested-by:
origin/world
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
---
I decided it is not worth writing a function to format the header url
that is
he user to use "git
remote prune" to fix 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
Tested-by:
origin/world
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
---
builtin/fetch.c | 22 ++
t/t5510-fetch.sh | 12 +
On Wed, Dec 18, 2013 at 3:54 PM, Junio C Hamano wrote:
> Tom Miller 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
>
On Wed, Dec 18, 2013 at 3:47 PM, Junio C Hamano wrote:
> Tom Miller 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 lin
transport url to a pretty url using
pretty_url(). Then it will print out the pretty 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
---
builtin/fetch.c | 60 +
fetch.
Signed-off-by: Tom Miller
Tested-by: Thomas Rast
---
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 100644
--- a/builtin/fetch.c
+++ b/builtin
rld
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
---
builtin/fetch.c | 9 ++---
1 file changed, 6 insertions(+), 3
: Tom Miller
---
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 *transport
expertise 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.
built
13 matches
Mail list logo
