date:20190207

Fwd: Query on GIT merge and conflicts

2019-02-07 Thread Vijay Sundar V

Hi Team,

I've query for which we have no solutions from Stackoverflow. Or we
couldn't find one. Would be great if you have one or can provide
suggestions with.

SO Link:
https://stackoverflow.com/questions/53704320/git-merge-remote-repository-project-to-sub-directory-of-current-repository-proje

I need to merge a particular branch from one project to a different
branch in another currently running project . For which I am following
below steps

In Source Repo-A: v23-branch, I created a local temp branch and moved
all the contents to a folder and made a local commit. Then In Target
Repo-B, I added the local git path like given below. git remote add
tmpmerge Then did a git fetch
of tmpmerge to get the branch details of Source Repo-A. And while
doing a git merge tmpmerge/temp --allow-unrelated-histories, I get so
many merge conflicts as describe in the bottom.

Below is the tree structure I am expecting to achieve it

Source Repo-A: v23-branch
module1
module2
pom.xml
Dockerfile

Target Repo B: some-branch
source Repo-A: v21-branch
|-module1
|-module2
|-pom.xml
|-Dockerfile
Repo-B-Files1
Repo-B-Files2
Repo-B-Files3
pom.xml
Jenkinsfile
Dockerfile

What I want to achieve is given below.

I want to merge source repo module to the destination module as
mentioned above structure because While merging contents as parent
directory overwrites some of my existing files available in the
current project like pom.xml , docker file etc. Instead of merging to
current project parent directory I want to write as sub directory with
all its log and history. But I'm facing CONFLICT(rename/delete),
CONFLICT(rename/rename) for module files... Thanks much in advance.

Thanks,

Vijay V

Re: [PATCH 1/1] git-p4: recover from inconsistent perforce history

2019-02-07 Thread Luke Diamand

On Wed,  6 Feb 2019 19:42:19 +
and...@adoakley.name wrote:

> From: Andrew Oakley 
> 
> Perforce allows you commit files and directories with the same name, so
> you could have files //depot/foo and //depot/foo/bar both checked in.  A
> p4 sync of a repository in this state fails.  Deleting one of the files
> recovers the repository.
> 
> When this happens we want git-p4 to recover in the same way as perforce.

I'm finding the test fails for me on a clean git repo, although I can't see any 
obvious reason why.

Having the ability to detect when Perforce users submit a change which creates 
a file-inside-a-file will be really very useful.

Luke


> 
> Signed-off-by: Andrew Oakley 
> ---
>  git-p4.py  | 41 ++--
>  t/t9834-git-p4-file-dir-bug.sh | 58 ++
>  2 files changed, 97 insertions(+), 2 deletions(-)
>  create mode 100755 t/t9834-git-p4-file-dir-bug.sh
> 
> diff --git a/git-p4.py b/git-p4.py
> index 3e12774f96..6bf2bbbcec 100755
> --- a/git-p4.py
> +++ b/git-p4.py
> @@ -3012,6 +3012,43 @@ def hasBranchPrefix(self, path):
>  print('Ignoring file outside of prefix: {0}'.format(path))
>  return hasPrefix
>  
> +def isIncluded(self, path):
> +return self.inClientSpec(path) and self.hasBranchPrefix(path)
> +
> +def findShadowedFiles(self, files, change):
> +# Perforce allows you commit files and directories with the same 
> name,
> +# so you could have files //depot/foo and //depot/foo/bar both 
> checked
> +# in.  A p4 sync of a repository in this state fails.  Deleting one 
> of
> +# the files recovers the repository.
> +#
> +# Git will not allow the broken state to exist and only the most 
> recent
> +# of the conflicting names is left in the repository.  When one of 
> the
> +# conflicting files is deleted we need to re-add the other one to 
> make
> +# sure the git repository recovers in the same way as perforce.
> +deleted = [f for f in files if f['action'] in self.delete_actions]
> +to_check = set()
> +for f in deleted:
> +path = f['path']
> +to_check.add(path + '/...')
> +while True:
> +path = path.rsplit("/", 1)[0]
> +if path == "/" or path in to_check:
> +break
> +to_check.add(path)
> +to_check = [p for p in to_check if self.isIncluded(p)]
> +if to_check:
> +stat_result = p4CmdList(
> +["fstat", "-T", "depotFile,headRev,headType"] +
> +["%s@%s" % (p, change) for p in to_check])
> +for record in stat_result:
> +if record['code'] != 'stat':
> +continue
> +files.append({
> +'action': 'add',
> +'path': record['depotFile'],
> +'rev': record['headRev'],
> +'type': record['headType']})
> +
>  def commit(self, details, files, branch, parent = "", allow_empty=False):
>  epoch = details["time"]
>  author = details["user"]
> @@ -3023,8 +3060,8 @@ def commit(self, details, files, branch, parent = "", 
> allow_empty=False):
>  if self.clientSpecDirs:
>  self.clientSpecDirs.update_client_spec_path_cache(files)
>  
> -files = [f for f in files
> -if self.inClientSpec(f['path']) and 
> self.hasBranchPrefix(f['path'])]
> +files = [f for f in files if self.isIncluded(f['path'])]
> +self.findShadowedFiles(files, details["change"])
>  
>  if gitConfigBool('git-p4.keepEmptyCommits'):
>  allow_empty = True
> diff --git a/t/t9834-git-p4-file-dir-bug.sh b/t/t9834-git-p4-file-dir-bug.sh
> new file mode 100755
> index 00..9839a3d2bb
> --- /dev/null
> +++ b/t/t9834-git-p4-file-dir-bug.sh
> @@ -0,0 +1,58 @@
> +#!/bin/sh
> +
> +test_description='git p4 directory/file bug handling
> +
> +This test creates files and directories with the same name in perforce and
> +checks that git-p4 recovers from the error at the same time as the perforce
> +repository.'
> +
> +. ./lib-git-p4.sh
> +
> +test_expect_success 'start p4d' '
> + start_p4d
> +'
> +
> +test_expect_success 'init depot' '
> + (
> + cd "$cli" &&
> +
> + touch add_file_add_dir_del_file add_file_add_dir_del_dir &&
> + p4 add add_file_add_dir_del_file add_file_add_dir_del_dir &&
> + mkdir add_dir_add_file_del_file add_dir_add_file_del_dir &&
> + touch add_dir_add_file_del_file/file 
> add_dir_add_file_del_dir/file &&
> + p4 add add_dir_add_file_del_file/file 
> add_dir_add_file_del_dir/file &&
> + p4 submit -d "add initial" &&
> +
> + rm -f add_file_add_dir_del_file add_file_add_dir_del_dir &&
> + mkdir add_file_add_dir_del_file add_file_add_dir_del_

Re: Proposal: Output should push to different servers in parallel

2019-02-07 Thread Ævar Arnfjörð Bjarmason

On Wed, Feb 06 2019, Victor Porton wrote:

> I experienced a slowdown in Git pushing when I push to more than one server.
>
> I propose:
>
> Run push to several servers in parallel.
>
> Not to mix the output, nevertheless serialize the output, that is for
> example cache the output of the second server push and start to output
> it immediately after the first server push is finished.
>
> This approach combines the advantages of the current way (I suppose it
> is so) to serialize pushes: first push to the first server, then to
> the second, etc. and of my idea to push in parallel.
>
> I think the best way would be use multithreading, but multiprocessing
> would be a good quick solution.

This seems like a reasonable idea, until such time as someone submits
patches to implement this in git you can do this with some invocation of
GNU parallel -k, i.e. operate on N remotes in parallel, and use the -k
option to buffer up all their output and present it in sequence.

[PATCH v3 0/3] Teach submodule set-branch subcommand

2019-02-07 Thread Denton Liu

I rebased the changes onto the latest 'next' because if this branch gets
merged into 'next', there'll be merge conflicts from
'dl/complete-submodule-absorbgitdirs'.

Currently, there is no way to set the branch of a submodule without
manually manipulating the .gitmodules file. This patchset introduces a
porcelain command that enables this.

Changes since v1:
* Fixed incorrect usage of OPT_CMDMODE

Changes since v2:
* Corrected missing argument for -b/--branch in git-submodule.txt
* Rebased onto latest next


Denton Liu (3):
  git-submodule.txt: "--branch " option defaults to 'master'
  submodule--helper: teach config subcommand --unset
  submodule: teach set-branch subcommand

 Documentation/git-submodule.txt| 14 +++-
 builtin/submodule--helper.c| 18 +++--
 contrib/completion/git-completion.bash |  5 +-
 git-submodule.sh   | 75 +++--
 t/t7411-submodule-config.sh|  9 +++
 t/t7419-submodule-set-branch.sh| 93 ++
 6 files changed, 200 insertions(+), 14 deletions(-)
 create mode 100755 t/t7419-submodule-set-branch.sh

-- 
2.20.1.522.g5f42c252e9

[PATCH v3 3/3] submodule: teach set-branch subcommand

2019-02-07 Thread Denton Liu

This teaches git-submodule the set-branch subcommand which allows the
branch of a submodule to be set through a porcelain command without
having to manually manipulate the .gitmodules file.
---
 Documentation/git-submodule.txt|  7 ++
 contrib/completion/git-completion.bash |  5 +-
 git-submodule.sh   | 75 +++--
 t/t7419-submodule-set-branch.sh| 93 ++
 4 files changed, 175 insertions(+), 5 deletions(-)
 create mode 100755 t/t7419-submodule-set-branch.sh

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 4150148fa3..6c608b3b8c 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -14,6 +14,7 @@ SYNOPSIS
 'git submodule' [--quiet] init [--] [...]
 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] ...)
 'git submodule' [--quiet] update [] [--] [...]
+'git submodule' [--quiet] set-branch [] [--] 
 'git submodule' [--quiet] summary [] [--] [...]
 'git submodule' [--quiet] foreach [--recursive] 
 'git submodule' [--quiet] sync [--recursive] [--] [...]
@@ -168,6 +169,12 @@ submodule with the `--init` option.
 If `--recursive` is specified, this command will recurse into the
 registered submodules, and update any nested submodules within.
 --
+set-branch ((-d|--default)|(-b|--branch )) [--] ::
+   Sets the default remote tracking branch for the submodule. The
+   `--branch` option allows the remote branch to be specified. The
+   `--default` option removes the submodule..branch configuration
+   key, which causes the tracking branch to default to 'master'.
+--
 summary [--cached|--files] [(-n|--summary-limit) ] [commit] [--] 
[...]::
Show commit summary between the given commit (defaults to HEAD) and
working tree/index. For a submodule in question, a series of commits
diff --git a/contrib/completion/git-completion.bash 
b/contrib/completion/git-completion.bash
index de56879960..0fccadfc97 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2573,7 +2573,7 @@ _git_submodule ()
 {
__git_has_doubledash && return
 
-   local subcommands="add status init deinit update summary foreach sync 
absorbgitdirs"
+   local subcommands="add status init deinit update set-branch summary 
foreach sync absorbgitdirs"
local subcommand="$(__git_find_on_cmdline "$subcommands")"
if [ -z "$subcommand" ]; then
case "$cur" in
@@ -2604,6 +2604,9 @@ _git_submodule ()
--force --rebase --merge --reference --depth 
--recursive --jobs
"
;;
+   set-branch,--*)
+   __gitcomp "--default --branch"
+   ;;
summary,--*)
__gitcomp "--cached --files --summary-limit"
;;
diff --git a/git-submodule.sh b/git-submodule.sh
index b5f2beee60..470f681573 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -10,6 +10,7 @@ USAGE="[--quiet] add [-b ] [-f|--force] [--name 
] [--reference ...]
or: $dashless [--quiet] deinit [-f|--force] (--all| [--] ...)
or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] 
[-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] 
[--reference ] [--recursive] [--] [...]
+   or: $dashless [--quiet] set-branch (--default|--branch ) [--] 
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit ] 
[commit] [--] [...]
or: $dashless [--quiet] foreach [--recursive] 
or: $dashless [--quiet] sync [--recursive] [--] [...]
@@ -684,6 +685,72 @@ cmd_update()
}
 }
 
+#
+# Configures a submodule's default branch
+#
+# $@ = requested path
+#
+cmd_set_branch() {
+   unset_branch=false
+   branch=
+
+   while test $# -ne 0
+   do
+   case "$1" in
+   -q|--quiet)
+   # we don't do anything with this but we need to accept 
it
+   ;;
+   -d|--default)
+   unset_branch=true
+   ;;
+   -b|--branch)
+   case "$2" in '') usage ;; esac
+   branch=$2
+   shift
+   ;;
+   --)
+   shift
+   break
+   ;;
+   -*)
+   usage
+   ;;
+   *)
+   break
+   ;;
+   esac
+   shift
+   done
+
+   if test $# -ne 1
+   then
+   usage
+   fi
+
+   # we can't use `git submodule--helper name` here because internally, it
+   # hashes the path so a trailing slash could lead to an unintentional no 
match
+   name="$(git submodule--helper list "$1" | cut -f2)"
+   if test -z "$name"
+   then
+   exit 1
+   fi
+
+   test -n "$branch"; has_

[PATCH v3 1/3] git-submodule.txt: "--branch " option defaults to 'master'

2019-02-07 Thread Denton Liu

This behavior is mentioned in gitmodules.txt but not in
git-submodule.txt so we copy the information over so that it is not
missed.

Also, add the missed argument to the -b/--branch option.

Signed-off-by: Denton Liu 
---
 Documentation/git-submodule.txt | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index ba3c4df550..4150148fa3 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -255,13 +255,14 @@ OPTIONS
This option is only valid for the deinit command. Unregister all
submodules in the working tree.
 
--b::
---branch::
+-b ::
+--branch ::
Branch of repository to add as submodule.
The name of the branch is recorded as `submodule..branch` in
`.gitmodules` for `update --remote`.  A special value of `.` is used to
indicate that the name of the branch in the submodule should be the
-   same name as the current branch in the current repository.
+   same name as the current branch in the current repository.  If the
+   option is not specified, it defaults to 'master'.
 
 -f::
 --force::
-- 
2.20.1.522.g5f42c252e9

[PATCH v3 2/3] submodule--helper: teach config subcommand --unset

2019-02-07 Thread Denton Liu

This teaches submodule--helper config the --unset option, which removes
the specified configuration key from the .gitmodule file.

Signed-off-by: Denton Liu 
---
 builtin/submodule--helper.c | 18 --
 t/t7411-submodule-config.sh |  9 +
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index b80fc4ba3d..a86eacf167 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -2148,17 +2148,22 @@ static int check_name(int argc, const char **argv, 
const char *prefix)
 static int module_config(int argc, const char **argv, const char *prefix)
 {
enum {
-   CHECK_WRITEABLE = 1
-   } command = 0;
+   NONE,
+   CHECK_WRITEABLE,
+   DO_UNSET
+   } command = NONE;
 
struct option module_config_options[] = {
OPT_CMDMODE(0, "check-writeable", &command,
N_("check if it is safe to write to the .gitmodules 
file"),
CHECK_WRITEABLE),
+   OPT_CMDMODE(0, "unset", &command,
+   N_("unset the config in the .gitmodules file"),
+   DO_UNSET),
OPT_END()
};
const char *const git_submodule_helper_usage[] = {
-   N_("git submodule--helper config name [value]"),
+   N_("git submodule--helper config name [--unset] [value]"),
N_("git submodule--helper config --check-writeable"),
NULL
};
@@ -2170,15 +2175,16 @@ static int module_config(int argc, const char **argv, 
const char *prefix)
return is_writing_gitmodules_ok() ? 0 : -1;
 
/* Equivalent to ACTION_GET in builtin/config.c */
-   if (argc == 2)
+   if (argc == 2 && command != DO_UNSET)
return print_config_from_gitmodules(the_repository, argv[1]);
 
/* Equivalent to ACTION_SET in builtin/config.c */
-   if (argc == 3) {
+   if (argc == 3 || (argc == 2 && command == DO_UNSET)) {
if (!is_writing_gitmodules_ok())
die(_("please make sure that the .gitmodules file is in 
the working tree"));
 
-   return config_set_in_gitmodules_file_gently(argv[1], argv[2]);
+   const char *value = (argc == 3) ? argv[2] : NULL;
+   return config_set_in_gitmodules_file_gently(argv[1], value);
}
 
usage_with_options(git_submodule_helper_usage, module_config_options);
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index 89690b7adb..fcc0fb82d8 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -142,6 +142,15 @@ test_expect_success 'reading submodules config from the 
working tree with "submo
)
 '
 
+test_expect_success 'unsetting submodules config from the working tree with 
"submodule--helper config --unset"' '
+   (cd super &&
+   git submodule--helper config --unset submodule.submodule.url &&
+   git submodule--helper config submodule.submodule.url >actual &&
+   test_must_be_empty actual
+   )
+'
+
+
 test_expect_success 'writing submodules config with "submodule--helper 
config"' '
(cd super &&
echo "new_url" >expect &&
-- 
2.20.1.522.g5f42c252e9

1 2 >

1 - 100 of 113 matches

Mail list logo