{"thread":{"id":"43102","subject":"Re: [PATCH] Make \"git checkout <branch> <path>\" work when <path> is a directory.","startedAt":"2006-11-17T05:49:21Z","lastAt":"2006-11-17T08:15:30Z","messageCount":4,"participants":["Junio C Hamano","Michael K. Edwards"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"295802","messageId":"f2b55d220611162149m719079f3ubdaeac43fe9798cb@mail.gmail.com","threadId":"43102","inReplyTo":null,"subject":"[PATCH] Make \"git checkout <branch> <path>\" work when <path> is a directory.","fromName":"Michael K. Edwards","fromEmail":"medwards.linux@gmail.com","sentAt":"2006-11-17T05:49:21Z","receivedAt":"2006-11-17T05:49:21Z","isPatch":true,"sender":{"key":"medwards.linux@gmail.com","avatar":null},"body":"This improves the workflow for, say, kernel subsystem backporting.\n\nSigned-off-by: Michael K. Edwards <medwards-linux@gmail.com>\n---\n git-checkout.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/git-checkout.sh b/git-checkout.sh\nindex dd47724..5866604 100755\n--- a/git-checkout.sh\n+++ b/git-checkout.sh\n@@ -106,7 +106,8 @@ Did you intend to checkout '$@' which ca\n \t\tgit-ls-tree --full-name -r \"$new\" \"$@\" |\n \t\tgit-update-index --index-info || exit $?\n \tfi\n-\tgit-checkout-index -f -u -- \"$@\"\n+\tgit-ls-files \"$@\" |\n+\tgit-checkout-index -f -u --stdin\n \texit $?\n else\n \t# Make sure we did not fall back on $arg^{tree} codepath\n-- \n"},{"id":"295642","messageId":"7vlkmavcai.fsf@assigned-by-dhcp.cox.net","threadId":"43102","inReplyTo":"f2b55d220611162149m719079f3ubdaeac43fe9798cb@mail.gmail.com","subject":"Re: [PATCH] Make \"git checkout <branch> <path>\" work when <path> is a directory.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-11-17T06:04:53Z","receivedAt":"2006-11-17T06:04:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n\nI think I sent out the same yesterday morning, though.\n\n\tMessage-ID: <7vbqn8msuw.fsf@assigned-by-dhcp.cox.net>\n\nThe difference is that the one tries to catch misspelled <path>.\n\n"},{"id":"298463","messageId":"f2b55d220611162218t3a752829hf922613c17fe326d@mail.gmail.com","threadId":"43102","inReplyTo":"7vlkmavcai.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Make \"git checkout <branch> <path>\" work when <path> is a directory.","fromName":"Michael K. Edwards","fromEmail":"medwards.linux@gmail.com","sentAt":"2006-11-17T06:18:57Z","receivedAt":"2006-11-17T06:18:57Z","isPatch":true,"sender":{"key":"medwards.linux@gmail.com","avatar":null},"body":"Ah.  Missed that patch, which is indeed a superset of mine.  Looks\nlike you committed it on branch \"next\"; is that a personal\nexperimental branch, or the integration branch against which patches\nshould be generated?\n\nCheers,\n"},{"id":"293847","messageId":"7vd57mtrod.fsf@assigned-by-dhcp.cox.net","threadId":"43102","inReplyTo":"f2b55d220611162218t3a752829hf922613c17fe326d@mail.gmail.com","subject":"Re: [PATCH] Make \"git checkout <branch> <path>\" work when <path> is a directory.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-11-17T08:15:30Z","receivedAt":"2006-11-17T08:15:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Michael K. Edwards\" <medwards.linux@gmail.com> writes:\n\n> Ah.  Missed that patch, which is indeed a superset of mine.  Looks\n> like you committed it on branch \"next\"; is that a personal\n> experimental branch, or the integration branch against which patches\n> should be generated?\n\nActually it is not pushed out anywhere yet but will appear on\nboth 'maint' and 'master' along with other post 1.4.4 fixes and\nwill be contained in the 1.4.4.1 maintenance release.\n\nThe role of each branch at my public repository is desribed in\nthis message:\n\n\tMessage-ID: <7vk62qhy4k.fsf@assigned-by-dhcp.cox.net>\n\thttp://article.gmane.org/gmane.comp.version-control.git/29951\n\nIn general, if your changes and fixes are applicable in\nisolation to \"master\", it is most appropriate to send patches\nagainst \"master\".  If you are following up a topic that is\ncooking in \"next\" (or \"pu\"), then basing your patch on \"master\"\nis obviously a bad idea and a patch that applies on \"next\" (or\n\"pu\") would be more appropriate.  If you can make the patch\nagainst the tip of the specific topic that would be even better\nbut it generally is more work for you, so I usually do not ask\nthat to contributors.\n\n\n"}]}