diff options
Diffstat (limited to 'dev-vcs/git-tools/files')
| -rw-r--r-- | dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch | 11 | ||||
| -rw-r--r-- | dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch | 27 |
2 files changed, 38 insertions, 0 deletions
diff --git a/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch b/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch new file mode 100644 index 000000000000..a7f59e0b04dc --- /dev/null +++ b/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch @@ -0,0 +1,11 @@ +--- a/git-restore-mtime 2016-01-27 14:05:09.000000000 -0800 ++++ b/git-restore-mtime 2016-01-27 21:51:17.000000000 -0800 +@@ -150,7 +150,7 @@ + ['--'] + args.pathspec, + stdout=subprocess.PIPE) + for line in gitobj.stdout: +- lsfileslist.add(os.path.relpath(line.strip(), workdir)) ++ lsfileslist.add(os.path.relpath(line.strip().decode(), workdir)) + + # List files matching user pathspec, relative to current directory + # git commands always print paths relative to work tree root diff --git a/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch b/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch new file mode 100644 index 000000000000..f921efd9be22 --- /dev/null +++ b/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch @@ -0,0 +1,27 @@ +diff --git a/git-restore-mtime b/git-restore-mtime +index fbc05d9..7bbd375 100755 +--- a/git-restore-mtime ++++ b/git-restore-mtime +@@ -74,6 +74,14 @@ parser.add_argument('--merge', '-m', + 'sometimes substantially. By default merge logs are only ' + 'used for files missing from regular commit logs.') + ++parser.add_argument('--first-parent', ++ action="store_true", ++ help='pass --first-parent to git whatchanged to hide the ' ++ 'second parent from the merge commit logs. Only has any ' ++ 'effect if --merge is also specified or --skip-missing ' ++ 'is not specified and there were files not found in regular ' ++ 'commit logs.') ++ + parser.add_argument('--skip-missing', '-s', + action="store_false", default=True, dest='missing', + help='do not try to find missing files. If some files were ' +@@ -252,6 +260,7 @@ def parselog(merge=False, filterlist=[]): + + gitobj = subprocess.Popen(gitcmd + shlex.split('whatchanged --pretty={}'.format(args.timeformat)) + + (['-m'] if merge else []) + ++ (['--first-parent'] if args.first_parent else []) + + ['--'] + filterlist, + stdout=subprocess.PIPE) + for line in gitobj.stdout:
\ No newline at end of file |