{"push_id":1164364836,"size":338,"distinct_size":0,"ref":"refs/heads/master","head":"05219a1276341e72d8082d76b7f5ed394b7437a4","before":"5fe494c54ae44ae01a8efa91d00ac9d4c1c475e9","commits":[{"sha":"8dc874b2ee61f0c457c4482ed2f202cac55b52ad","author":{"name":"Stephen P. Smith","email":"9d3df909412b97940c408999ac32ece65fed8101@cox.net"},"message":"wt-status.c: set commitable bit if there is a meaningful merge.\n\nThe 'commit --dry-run' and 'commit' return values differed if a\nconflicted merge had been resolved and the resulting commit would\nrecord the same tree as the parent.\n\nUpdate show_merge_in_progress to set the commitable bit if conflicts\nhave been resolved and a merge is in progress.\n\nSigned-off-by: Stephen P. Smith <ischis2@cox.net>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/8dc874b2ee61f0c457c4482ed2f202cac55b52ad"},{"sha":"71d99b81dad4eaf3b25bedd5790d68df509f2a45","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: index-pack: use plural string instead of normal one\n\nGit could output \"completed with 1 local objects\", but in this\ncase using \"object\" instead of \"objects\" is the correct form.\n\nUse Q_() instead of _().\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/71d99b81dad4eaf3b25bedd5790d68df509f2a45"},{"sha":"ab86885a61cdbcae19d08697285957462593069d","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: builtin/branch.c: mark option for translation\n\nMark description and parameter for option \"set-upstream-to\" for translation.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/ab86885a61cdbcae19d08697285957462593069d"},{"sha":"ed47fdf7fa80ae5f93eb708e82c625086f837b3f","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: unpack-trees: mark strings for translation\n\nMark strings seen by the user inside setup_unpack_trees_porcelain() and\ndisplay_error_msgs() functions for translation.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/ed47fdf7fa80ae5f93eb708e82c625086f837b3f"},{"sha":"8ae51c412815c1ded92bd85e47a5c209d516d969","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: builtin/rm.c: remove a comma ',' from string\n\nRemove a comma from string marked for translation. Make the string match the\none in builtin/mv.c. Now translators have do handle this string only once.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/8ae51c412815c1ded92bd85e47a5c209d516d969"},{"sha":"2010aabd91eec0e8b074774e924e5264a522a923","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: branch: unmark string for translation\n\nUnmark strings for translation for command help/hint.\nThese strings can not be translated, just copied.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/2010aabd91eec0e8b074774e924e5264a522a923"},{"sha":"60ea78b8a1954a7f09c92d0b5625d927eb951263","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: branch: move comment for translators\n\nMove and split comment for translators (marked by TRANSLATORS) to be\nimmediately above the strings marked for translation.\n\nAs a result, the comment can now be extracted by xgettext.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/60ea78b8a1954a7f09c92d0b5625d927eb951263"},{"sha":"5af297185ee189b3d09464badf55f855cf94c493","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"fsck_commit_buffer(): do not special case the last validation\n\nThe pattern taken by all the validations in this function is:\n\n\tif (notice a violation exists) {\n\t\terr = report(... VIOLATION_KIND ...);\n\t\tif (err)\n\t\t\treturn err;\n\t}\n\nwhere report() returns zero if specified kind of violation is set to\nbe ignored, and otherwise shows an error message and returns non-zero.\n\nThe last validation in the function immediately before the function\nreturns 0 to declare \"all good\" can cheat and directly return the\nreturn value from report(), and the current code does so, i.e.\n\n\tif (notice a violation exists)\n\t\treturn report(... VIOLATION_KIND ...);\n\treturn 0;\n\nBut that is a selfish code that declares it is the ultimate and\nfinal form of the function, never to be enhanced later.  To allow\nand invite future enhancements, make the last test follow the same\npattern.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/5af297185ee189b3d09464badf55f855cf94c493"},{"sha":"7307dd898988c79fc687051e783b3cac8488a559","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init\n\n* sb/submodule-helper-clone-regression-fix:\n  submodule--helper, module_clone: catch fprintf failure\n  submodule--helper: do not borrow absolute_path() result for too long\n  submodule--helper, module_clone: always operate on absolute paths\n  submodule--helper clone: create the submodule path just once\n  submodule--helper: fix potential NULL-dereference\n  recursive submodules: test for relative paths","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/7307dd898988c79fc687051e783b3cac8488a559"},{"sha":"ee30f17805f51d372ff9c5036f1d142c167e5e34","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init\n\n\"git submodule\" reports the paths of submodules the command\nrecurses into, but this was incorrect when the command was not run\nfrom the root level of the superproject.\n\nAny further comments?  Otherwise will merge to 'next'.\n\n* sb/submodule-path-misc-bugs: (600 commits)\n  t7407: make expectation as clear as possible\n  submodule update: test recursive path reporting from subdirectory\n  submodule update: align reporting path for custom command execution\n  submodule status: correct path handling in recursive submodules\n  submodule update --init: correct path handling in recursive submodules\n  submodule foreach: correct path display in recursive submodules\n  Git 2.8\n  Documentation: fix git-p4 AsciiDoc formatting\n  mingw: skip some tests in t9115 due to file name issues\n  t1300: fix the new --show-origin tests on Windows\n  t1300-repo-config: make it resilient to being run via 'sh -x'\n  config --show-origin: report paths with forward slashes\n  submodule: fix regression for deinit without submodules\n  l10n: pt_PT: Update and add new translations\n  l10n: ca.po: update translation\n  Git 2.8-rc4\n  Documentation: fix broken linkgit to git-config\n  Documentation: use ASCII quotation marks in git-p4\n  Revert \"config.mak.uname: use clang for Mac OS X 10.6\"\n  git-compat-util: st_add4: work around gcc 4.2.x compiler crash\n  ...","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/ee30f17805f51d372ff9c5036f1d142c167e5e34"},{"sha":"ed34567c7bb1f3747255ca0301b84abad6d06712","author":{"name":"Junio C Hamano","email":"3228067b6039a0d99bddaf967dafdecd5cc61600@pobox.com"},"message":"ll-merge: fix typo in comment\n\nWhen a944af1d (merge: teach -Xours/-Xtheirs to binary ll-merge\ndriver, 2012-09-08) introduced FAVOR_OURS/FAVOR_THEIRS to the binary\nll-merge driver, it changed what happens to the merge result for the\nouter merge, and updated the comment from:\n\n    The tentative merge result is \"ours\" for the final round, or\n    common ancestor for an internal merge.  Still return \"conflicted\n    merge\" status.\n\nto\n\n    The tentative merge result is the or common ancestor for an\n    internal merge.\n\nWhat happened is obvious.  I noticed the lack of definitive article\nin front of \"common\" but failed to remove \"or\".  Also I forgot to\ndescribe what I did for the final merge, probably because I was\nsatisified by the description in the log message.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/ed34567c7bb1f3747255ca0301b84abad6d06712"},{"sha":"63e95beb085ce8ae359d728ec0a54c3dcfe741f5","author":{"name":"Stefan Beller","email":"75e5af3a5fc6e432c184f339c5c73c118a246be6@google.com"},"message":"submodule: port resolve_relative_url from shell to C\n\nLater on we want to automatically call `git submodule init` from\nother commands, such that the users don't have to initialize the\nsubmodule themselves.  As these other commands are written in C\nalready, we'd need the init functionality in C, too.  The\n`resolve_relative_url` function is a large part of that init\nfunctionality, so start by porting this function to C.\n\nTo create the tests in t0060, the function `resolve_relative_url`\nwas temporarily enhanced to write all inputs and output to disk\nwhen running the test suite. The added tests in this patch are\na small selection thereof.\n\nSigned-off-by: Stefan Beller <sbeller@google.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/63e95beb085ce8ae359d728ec0a54c3dcfe741f5"},{"sha":"3604242f080a813d6f20a7394def422d1e55b30e","author":{"name":"Stefan Beller","email":"75e5af3a5fc6e432c184f339c5c73c118a246be6@google.com"},"message":"submodule: port init from shell to C\n\nBy having the `submodule init` functionality in C, we can reference it\neasier from other parts in the code in later patches. The code is split\nup to have one function to initialize one submodule and a calling function\nthat takes care of the rest, such as argument handling and translating the\narguments to the paths of the submodules.\n\nThis is the first submodule subcommand that is fully converted to C\nexcept for the usage string, so this is actually removing a call to\nthe `submodule--helper list` function, which is supposed to be used in\nthis transition. Instead we'll make a direct call to `module_list_compute`.\n\nAn explanation why we need to edit the prefixes in cmd_update in\ngit-submodule.sh in this patch:\n\nBy having no processing in the shell part, we need to convey the notion\nof wt_prefix and prefix to the C parts, which former patches punted on\nand did the processing of displaying path in the shell.\n\n`wt_prefix` used to hold the path from the repository root to the current\ndirectory, e.g. wt_prefix would be t/ if the user invoked the\n`git submodule` command in ~/repo/t and ~repo is the GIT_DIR.\n\n`prefix` used to hold the relative path from the repository root to the\noperation, e.g. if you have recursive submodules, the shell script would\nmodify the `prefix` in each recursive step by adding the submodule path.\n\nWe will pass `wt_prefix` into the C helper via `git -C <dir>` as that\nwill setup git in the directory the user actually called git-submodule.sh\nfrom. The `prefix` will be passed in via the `--prefix` option.\n\nHaving `prefix` and `wt_prefix` relative to the GIT_DIR of the\ncalling superproject is unfortunate with this patch as the C code doesn't\nknow about a possible recursion from a superproject via `submodule update\n--init --recursive`.\n\nTo fix this, we change the meaning of `wt_prefix` to point to the current\nproject instead of the superproject and `prefix` to include any relative\npaths issues in the superproject. That way `prefix` will become the leading\npart for displaying paths and `wt_prefix` will be empty in recursive\ncalls for now.\n\nThe new notion of `wt_prefix` and `prefix` still allows us to reconstruct\nthe calling directory in the superproject by just traveling reverse of\n`prefix`.\n\nSigned-off-by: Stefan Beller <sbeller@google.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/3604242f080a813d6f20a7394def422d1e55b30e"},{"sha":"045fac5845b295d76420db53078ab4af4391e988","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: git-parse-remote.sh: mark strings for translation\n\nChange Makefile to include git-parse-remote.sh in LOCALIZED_SH.\n\nTODO: remove 3rd argument of error_on_missing_default_upstream function\nthat is no longer required.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/045fac5845b295d76420db53078ab4af4391e988"},{"sha":"8a0de58a2a0cfd64944c2de9df184253286b7eac","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: builtin/pull.c: mark placeholders for translation\n\nSome translations might also translate \"<remote>\" and \"<branch>\".\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/8a0de58a2a0cfd64944c2de9df184253286b7eac"},{"sha":"daf9f6499f853804270da4456664c2ff576774de","author":{"name":"Vasco Almeida","email":"f98f187d0ff8884aeb095e6b3c606d635b3abcdf@sapo.pt"},"message":"i18n: builtin/pull.c: split strings marked for translation\n\nSplit string \"If you wish to set tracking information\nfor this branch you can do so with:\\n\" to match occurring string in\ngit-parse-remote.sh. In this case, the translator handles it only once.\n\nOn the other hand, the translations of the string that were already made\nare mark as fuzzy and the translator needs to correct it herself.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/daf9f6499f853804270da4456664c2ff576774de"},{"sha":"8425b7ea6a00c443ca3649545ac6e9ddfa196ef6","author":{"name":"Pranit Bauva","email":"40a45a699d3945bf6e080cdb09dfa314e9c99236@gmail.com"},"message":"t0040-test-parse-options.sh: fix style issues\n\nSigned-off-by: Pranit Bauva <pranit.bauva@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/8425b7ea6a00c443ca3649545ac6e9ddfa196ef6"},{"sha":"36e6a5baf1d45e125fcdb99781a0c6448109b44d","author":{"name":"Pranit Bauva","email":"40a45a699d3945bf6e080cdb09dfa314e9c99236@gmail.com"},"message":"test-parse-options: print quiet as integer\n\nWe would want to see how multiple --quiet options affect the value of\nthe underlying variable (we may want \"--quiet --quiet\" to still be 1, or\nwe may want to see the value incremented to 2). Show the value as\ninteger to allow us to inspect it.\n\nSigned-off-by: Pranit Bauva <pranit.bauva@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/36e6a5baf1d45e125fcdb99781a0c6448109b44d"},{"sha":"ba0897e6ae6b0b3f259efb31be0f1ab3d820aacf","author":{"name":"Nguyễn Thái Ngọc Duy","email":"d0e3b15a74ff6c70e81434a55b9c843230dc3715@gmail.com"},"message":"dir.c: rename str(n)cmp_icase to fspath(n)cmp\n\nThese functions compare two paths that are taken from file system.\nDepending on the running file system, paths may need to be compared\ncase-sensitively or not, and maybe even something else in future. The\ncurrent names do not convey that well.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/ba0897e6ae6b0b3f259efb31be0f1ab3d820aacf"},{"sha":"15cdfea734ffce99d930e8e8016787b57ac47386","author":{"name":"Nguyễn Thái Ngọc Duy","email":"d0e3b15a74ff6c70e81434a55b9c843230dc3715@gmail.com"},"message":"path.c: add git_common_path() and strbuf_git_common_path()\n\nThese are mostly convenient functions to reduce code duplication. Most\nof the time, we should be able to get by with git_path() which handles\n$GIT_COMMON_DIR internally. However there are a few cases where we need\nto construct paths manually, for example some paths from a specific\nworktree. These functions will enable that.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/larsxschneider/git/commits/15cdfea734ffce99d930e8e8016787b57ac47386"}]}
{"actor":{"display_login":"larsxschneider"}}