Git https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v1.7.7.4 2011-11-01T23:11:00Z 2011-11-01T23:11:00Z Junio C Hamano gitster@pobox.com 2011-11-01T23:11:00Z urn:sha1:0814d6e554c45636f41856cc2204abe2f661560c * jk/pull-rebase-with-work-tree: pull,rebase: handle GIT_WORK_TREE better Conflicts: git-pull.sh 2011-10-13T19:16:36Z Jeff King peff@peff.net 2011-10-13T15:59:24Z urn:sha1:035b5bf6431dbf8f3cde2f44b0d7ef893b95b605 You can't currently run git-pull or git-rebase from outside of the work tree, even with GIT_WORK_TREE set, due to an overeager require_work_tree function. Commit e2eb527 documents this problem and provides the infrastructure for a fix, but left it to later commits to audit and update individual scripts. Changing these scripts to use require_work_tree_exists is easy to verify. We immediately call cd_to_toplevel, anyway. Therefore no matter which function we use, the state afterwards is one of: 1. We have a work tree, and we are at the top level. 2. We don't have a work tree, and we have died. The only catch is that we must also make sure no code that ran before the cd_to_toplevel assumed that we were already in the working tree. In this case, we will only have included shell libraries and called set_reflog_action, neither of which care about the current working directory at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-08-25T23:00:16Z Junio C Hamano gitster@pobox.com 2011-08-25T23:00:16Z urn:sha1:957450054cfbbe0d4ae8d33f7b74eace6e290f16 * js/i18n-scripts: submodule: take advantage of gettextln and eval_gettextln. stash: take advantage of eval_gettextln pull: take advantage of eval_gettextln git-am: take advantage of gettextln and eval_gettextln. gettext: add gettextln, eval_gettextln to encode common idiom 2011-08-08T19:33:36Z Junio C Hamano gitster@pobox.com 2011-08-08T19:33:36Z urn:sha1:1421fd9df4f1e3ed232bd1c683c6e264a464a41e * oa/pull-reflog: pull: remove extra space from reflog message Conflicts: git-pull.sh 2011-08-08T19:04:42Z Jon Seymour jon.seymour@gmail.com 2011-08-07T11:58:15Z urn:sha1:c2b1a95c468d742e61fcb7c6e1592f7f5be60ea6 Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-08-01T23:05:44Z Ori Avtalion ori@avtalion.name 2011-07-29T07:19:26Z urn:sha1:c98d1e4148ec32cac3318ca96dd262d27b9f8a03 When executing "git pull" with no arguments, the reflog message was: "pull : Fast-forward" Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-21T18:57:15Z Ævar Arnfjörð Bjarmason avarab@gmail.com 2011-05-21T18:43:57Z urn:sha1:3320a973fee4a238e684d0203b0f2d4b941a2c2b Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-21T18:57:15Z Ævar Arnfjörð Bjarmason avarab@gmail.com 2011-05-21T18:43:56Z urn:sha1:9f35aaa917455dee3d205fc28e549a3c640fb448 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-21T18:57:15Z Ævar Arnfjörð Bjarmason avarab@gmail.com 2011-05-21T18:43:55Z urn:sha1:85af5f82a67f87c7c6054572729a48d2182c72d4 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-05-21T18:57:15Z Ævar Arnfjörð Bjarmason avarab@gmail.com 2011-05-21T18:43:54Z urn:sha1:a9f578685299239ae2de16fb7389ee9f38364b6e Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>