Skip to content

Fix duplicate fetch, -t option fetches other refs too #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2016
Merged

Fix duplicate fetch, -t option fetches other refs too #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5335516
Remove duplicate fetch, -t option fetches other refs too
naderman Jan 26, 2016
55b5816
Actually remove unnecessary fetch
naderman Jan 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions git-subsplit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,12 @@ subsplit_update()

say "Updating subsplit from origin"

git fetch -q origin
git fetch -q -t origin
git checkout master
git reset --hard origin/master

if [ -n "$VERBOSE" ];
then
echo "${DEBUG} git fetch -q origin"
echo "${DEBUG} git fetch -q -t origin"
echo "${DEBUG} git checkout master"
Copy link
Member

@simensen simensen Jan 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You removed the duplicate in the echo but not on line 330 above where it is done for real. It is unclear to me if I actually need both w/ and w/o tags. If you know for sure we don't need git fetch bare you can comment out the actual line above, too, if you want to. I always thought --tags were optional and if you did get tags it was tags only. Though that might just be git push behavior. :)

Copy link
Contributor Author

@naderman naderman Jan 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha oops, was copying this from a modified version, sorry.

And yes, it specifically says so in the docs: "-t, --tags: Fetch all tags from the remote [...] in addition to whatever else would otherwise be fetched."

echo "${DEBUG} git reset --hard origin/master"
Expand Down